Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c25abff5 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Drop the pointless linear legacy LUT load on CHV 



We now bypass the legacy LUT when it's not needed, so
no point in filling it up with a linear LUT.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190327155045.28446-10-ville.syrjala@linux.intel.com
parent f65d5528

drivers/gpu/drm/i915/intel_color.c

+1 −16
Original line number Diff line number Diff line
@@ -376,15 +376,6 @@ static void i9xx_load_luts_internal(const struct intel_crtc_state *crtc_state, 
				(drm_color_lut_extract(lut[i].green, 8) << 8) |

				drm_color_lut_extract(lut[i].blue, 8);



			if (HAS_GMCH(dev_priv))

				I915_WRITE(PALETTE(pipe, i), word);

			else

				I915_WRITE(LGC_PALETTE(pipe, i), word);

		}

	} else {

		for (i = 0; i < 256; i++) {

			u32 word = (i << 16) | (i << 8) | i;



			if (HAS_GMCH(dev_priv))

				I915_WRITE(PALETTE(pipe, i), word);

			else
@@ -643,7 +634,7 @@ static void cherryview_load_luts(const struct intel_crtc_state *crtc_state) 
	cherryview_load_csc_matrix(crtc_state);



	if (crtc_state_is_legacy_gamma(crtc_state)) {

		i9xx_load_luts_internal(crtc_state, gamma_lut);

		i9xx_load_luts(crtc_state);

		return;

	}
@@ -682,12 +673,6 @@ static void cherryview_load_luts(const struct intel_crtc_state *crtc_state) 
			I915_WRITE(CGM_PIPE_GAMMA(pipe, i, 1), word1);

		}

	}



	/*

	 * Also program a linear LUT in the legacy block (behind the

	 * CGM block).

	 */

	i9xx_load_luts_internal(crtc_state, NULL);

}



void intel_color_load_luts(const struct intel_crtc_state *crtc_state)