From: Ville Syrjälä Date: Fri, 15 Mar 2019 19:54:44 +0000 (+0200) Subject: drm/i915: Fix legacy gamma mode for ICL X-Git-Tag: v5.4-rc1~498^2~29^2~476 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a0404408d3266fa3116979297b3bb47fdb9dc0b;p=platform%2Fkernel%2Flinux-rpi.git drm/i915: Fix legacy gamma mode for ICL We must remember to actually enable the post CSC gamma if we expect the legacy LUT to work. Seems to fix NV12 crc tests on the SDR planes. Curiously we apparently managed to get 100% match for the HDR planes even without chopping off the low bits. Cc: Uma Shankar Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20190315195445.26527-1-ville.syrjala@linux.intel.com Reviewed-by: Maarten Lankhorst --- diff --git a/drivers/gpu/drm/i915/intel_color.c b/drivers/gpu/drm/i915/intel_color.c index 8038f0f..467fd1a 100644 --- a/drivers/gpu/drm/i915/intel_color.c +++ b/drivers/gpu/drm/i915/intel_color.c @@ -832,6 +832,9 @@ int intel_color_check(struct intel_crtc_state *crtc_state) if (!crtc_state->gamma_enable || crtc_state_is_legacy_gamma(crtc_state)) { crtc_state->gamma_mode = GAMMA_MODE_MODE_8BIT; + if (INTEL_GEN(dev_priv) >= 11 && + crtc_state->gamma_enable) + crtc_state->gamma_mode |= POST_CSC_GAMMA_ENABLE; return 0; }