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

Commit 1f0017f6 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Use more atomic state in intel_color.c 



crtc_state is already passed around, use it instead of crtc->config.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470755054-32699-16-git-send-email-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 85cb48a1

drivers/gpu/drm/i915/intel_color.c

+14 −10
Original line number Original line Diff line number Diff line
@@ -100,13 +100,14 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state) 
	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	int i, pipe = intel_crtc->pipe;

	int i, pipe = intel_crtc->pipe;

	uint16_t coeffs[9] = { 0, };

	uint16_t coeffs[9] = { 0, };

	struct intel_crtc_state *intel_crtc_state = to_intel_crtc_state(crtc_state);





	if (crtc_state->ctm) {

	if (crtc_state->ctm) {

		struct drm_color_ctm *ctm =

		struct drm_color_ctm *ctm =

			(struct drm_color_ctm *)crtc_state->ctm->data;

			(struct drm_color_ctm *)crtc_state->ctm->data;

		uint64_t input[9] = { 0, };

		uint64_t input[9] = { 0, };





		if (intel_crtc->config->limited_color_range) {

		if (intel_crtc_state->limited_color_range) {

			ctm_mult_by_limited(input, ctm->matrix);

			ctm_mult_by_limited(input, ctm->matrix);

		} else {

		} else {

			for (i = 0; i < ARRAY_SIZE(input); i++)

			for (i = 0; i < ARRAY_SIZE(input); i++)
@@ -158,7 +159,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state) 
		 * into consideration.

		 * into consideration.

		 */

		 */

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

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

			if (intel_crtc->config->limited_color_range)

			if (intel_crtc_state->limited_color_range)

				coeffs[i * 3 + i] =

				coeffs[i * 3 + i] =

					I9XX_CSC_COEFF_LIMITED_RANGE;

					I9XX_CSC_COEFF_LIMITED_RANGE;

			else

			else
@@ -182,7 +183,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state) 
	if (INTEL_INFO(dev)->gen > 6) {

	if (INTEL_INFO(dev)->gen > 6) {

		uint16_t postoff = 0;

		uint16_t postoff = 0;





		if (intel_crtc->config->limited_color_range)

		if (intel_crtc_state->limited_color_range)

			postoff = (16 * (1 << 12) / 255) & 0x1fff;

			postoff = (16 * (1 << 12) / 255) & 0x1fff;





		I915_WRITE(PIPE_CSC_POSTOFF_HI(pipe), postoff);

		I915_WRITE(PIPE_CSC_POSTOFF_HI(pipe), postoff);
@@ -193,7 +194,7 @@ static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state) 
	} else {

	} else {

		uint32_t mode = CSC_MODE_YUV_TO_RGB;

		uint32_t mode = CSC_MODE_YUV_TO_RGB;





		if (intel_crtc->config->limited_color_range)

		if (intel_crtc_state->limited_color_range)

			mode |= CSC_BLACK_SCREEN_OFFSET;

			mode |= CSC_BLACK_SCREEN_OFFSET;





		I915_WRITE(PIPE_CSC_MODE(pipe), mode);

		I915_WRITE(PIPE_CSC_MODE(pipe), mode);
@@ -263,7 +264,8 @@ void intel_color_set_csc(struct drm_crtc_state *crtc_state) 




/* Loads the legacy palette/gamma unit for the CRTC. */

/* Loads the legacy palette/gamma unit for the CRTC. */

static void i9xx_load_luts_internal(struct drm_crtc *crtc,

static void i9xx_load_luts_internal(struct drm_crtc *crtc,

				    struct drm_property_blob *blob)

				    struct drm_property_blob *blob,

				    struct intel_crtc_state *crtc_state)

{

{

	struct drm_device *dev = crtc->dev;

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -272,7 +274,7 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc, 
	int i;

	int i;





	if (HAS_GMCH_DISPLAY(dev)) {

	if (HAS_GMCH_DISPLAY(dev)) {

		if (intel_crtc_has_type(intel_crtc->config, INTEL_OUTPUT_DSI))

		if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DSI))

			assert_dsi_pll_enabled(dev_priv);

			assert_dsi_pll_enabled(dev_priv);

		else

		else

			assert_pll_enabled(dev_priv, pipe);

			assert_pll_enabled(dev_priv, pipe);
@@ -305,7 +307,8 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc, 




static void i9xx_load_luts(struct drm_crtc_state *crtc_state)

static void i9xx_load_luts(struct drm_crtc_state *crtc_state)

{

{

	i9xx_load_luts_internal(crtc_state->crtc, crtc_state->gamma_lut);

	i9xx_load_luts_internal(crtc_state->crtc, crtc_state->gamma_lut,

				to_intel_crtc_state(crtc_state));

}

}





/* Loads the legacy palette/gamma unit for the CRTC on Haswell. */

/* Loads the legacy palette/gamma unit for the CRTC on Haswell. */
@@ -323,7 +326,7 @@ static void haswell_load_luts(struct drm_crtc_state *crtc_state) 
	 * Workaround : Do not read or write the pipe palette/gamma data while

	 * Workaround : Do not read or write the pipe palette/gamma data while

	 * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled.

	 * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled.

	 */

	 */

	if (IS_HASWELL(dev) && intel_crtc->config->ips_enabled &&

	if (IS_HASWELL(dev) && intel_crtc_state->ips_enabled &&

	    (intel_crtc_state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) {

	    (intel_crtc_state->gamma_mode == GAMMA_MODE_MODE_SPLIT)) {

		hsw_disable_ips(intel_crtc);

		hsw_disable_ips(intel_crtc);

		reenable_ips = true;

		reenable_ips = true;
@@ -436,7 +439,8 @@ static void cherryview_load_luts(struct drm_crtc_state *state) 
		/* Turn off degamma/gamma on CGM block. */

		/* Turn off degamma/gamma on CGM block. */

		I915_WRITE(CGM_PIPE_MODE(pipe),

		I915_WRITE(CGM_PIPE_MODE(pipe),

			   (state->ctm ? CGM_PIPE_MODE_CSC : 0));

			   (state->ctm ? CGM_PIPE_MODE_CSC : 0));

		i9xx_load_luts_internal(crtc, state->gamma_lut);

		i9xx_load_luts_internal(crtc, state->gamma_lut,

					to_intel_crtc_state(state));

		return;

		return;

	}

	}
@@ -479,7 +483,7 @@ static void cherryview_load_luts(struct drm_crtc_state *state) 
	 * Also program a linear LUT in the legacy block (behind the

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

	 * CGM block).

	 * CGM block).

	 */

	 */

	i9xx_load_luts_internal(crtc, NULL);

	i9xx_load_luts_internal(crtc, NULL, to_intel_crtc_state(state));

}

}





void intel_color_load_luts(struct drm_crtc_state *crtc_state)

void intel_color_load_luts(struct drm_crtc_state *crtc_state)