]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/i915: Extract bdw_color_check()
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 27 Mar 2019 15:50:42 +0000 (17:50 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 28 Mar 2019 19:29:53 +0000 (21:29 +0200)
Provide a separate .color_check() for BDW+ where we currently
provide the split gamma mode etc.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190327155045.28446-8-ville.syrjala@linux.intel.com
drivers/gpu/drm/i915/intel_color.c

index 90ebcf7bef82807dc784ee5bf2b41c63562c6e2f..d9be011ae49a33d2f9ab01f98495ee521dbd8ac6 100644 (file)
@@ -883,6 +883,43 @@ static int chv_color_check(struct intel_crtc_state *crtc_state)
        return 0;
 }
 
+static u32 bdw_gamma_mode(const struct intel_crtc_state *crtc_state)
+{
+       if (!crtc_state->gamma_enable ||
+           crtc_state_is_legacy_gamma(crtc_state))
+               return GAMMA_MODE_MODE_8BIT;
+       else
+               return GAMMA_MODE_MODE_SPLIT;
+}
+
+static int bdw_color_check(struct intel_crtc_state *crtc_state)
+{
+       int ret;
+
+       ret = check_luts(crtc_state);
+       if (ret)
+               return ret;
+
+       crtc_state->gamma_enable =
+               (crtc_state->base.gamma_lut ||
+                crtc_state->base.degamma_lut) &&
+               !crtc_state->c8_planes;
+
+       crtc_state->csc_enable =
+               crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB ||
+               crtc_state->base.ctm || crtc_state->limited_color_range;
+
+       crtc_state->gamma_mode = bdw_gamma_mode(crtc_state);
+
+       crtc_state->csc_mode = 0;
+
+       ret = intel_color_add_affected_planes(crtc_state);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 static u32 glk_gamma_mode(const struct intel_crtc_state *crtc_state)
 {
        if (!crtc_state->gamma_enable ||
@@ -1033,6 +1070,8 @@ void intel_color_init(struct intel_crtc *crtc)
                        dev_priv->display.color_check = icl_color_check;
                else if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
                        dev_priv->display.color_check = glk_color_check;
+               else if (INTEL_GEN(dev_priv) >= 8)
+                       dev_priv->display.color_check = bdw_color_check;
                else
                        dev_priv->display.color_check = _intel_color_check;