drm/i915: Pass limited_range explicitly to ilk_csc_convert_ctm()

Since pre-icl vs. icl+ handle the limited range
output stuff a bit differently it's probably
less confusing if we just pass that information
explicitly into ilk_csc_convert_ctm().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221026113906.10551-8-ville.syrjala@linux.intel.com
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index e881c95ee45107f62d1e87fa756b5c177968a470..946fb767f3e075bb404cbf818c90140b3a775a3f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -259,14 +259,14 @@ static bool ilk_csc_limited_range(const struct intel_crtc_state *crtc_state)
 }
 
 static void ilk_csc_convert_ctm(const struct intel_crtc_state *crtc_state,
-                               u16 coeffs[9])
+                               u16 coeffs[9], bool limited_color_range)
 {
        const struct drm_color_ctm *ctm = crtc_state->hw.ctm->data;
        const u64 *input;
        u64 temp[9];
        int i;
 
-       if (ilk_csc_limited_range(crtc_state))
+       if (limited_color_range)
                input = ctm_mult_by_limited(temp, ctm->matrix);
        else
                input = ctm->matrix;
@@ -319,7 +319,7 @@ static void ilk_load_csc_matrix(const struct intel_crtc_state *crtc_state)
        if (crtc_state->hw.ctm) {
                u16 coeff[9];
 
-               ilk_csc_convert_ctm(crtc_state, coeff);
+               ilk_csc_convert_ctm(crtc_state, coeff, limited_color_range);
                ilk_update_pipe_csc(crtc, ilk_csc_off_zero, coeff,
                                    limited_color_range ?
                                    ilk_csc_postoff_limited_range :
@@ -354,7 +354,7 @@ static void icl_load_csc_matrix(const struct intel_crtc_state *crtc_state)
        if (crtc_state->hw.ctm) {
                u16 coeff[9];
 
-               ilk_csc_convert_ctm(crtc_state, coeff);
+               ilk_csc_convert_ctm(crtc_state, coeff, false);
                ilk_update_pipe_csc(crtc, ilk_csc_off_zero,
                                    coeff, ilk_csc_off_zero);
        }