Skip to contentSkip to conversation

drm/i915: color management atomic fixes

PATCH In review Maarten Lankhorst 3 participants 9 messages Mar 30, 2016 – Mar 31, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover drm/i915: color management atomic fixes

Some small fixes to color management.

crtc_state should be passed, a redundant check removed, and color management updated during vblank evasion.

Maarten Lankhorst (3):
drm/i915: Pass crtc_state to color management functions. drm/i915: Do not check crtc_state->active in intel_color_load_luts. drm/i915: Update color management during vblank evasion.

 drivers/gpu/drm/i915/i915_drv.h      |  4 ++--
 drivers/gpu/drm/i915/intel_color.c   | 45 +++++++++++++++++-------------------
 drivers/gpu/drm/i915/intel_display.c | 41 ++++++++++++++++----------------
 drivers/gpu/drm/i915/intel_drv.h     |  4 ++--
 4 files changed, 46 insertions(+), 48 deletions(-)
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/3 drm/i915: Pass crtc_state to color management functions.

---
 drivers/gpu/drm/i915/i915_drv.h      |  4 ++--
 drivers/gpu/drm/i915/intel_color.c   | 43 ++++++++++++++++++------------------
 drivers/gpu/drm/i915/intel_display.c | 22 +++++++++++-------
 drivers/gpu/drm/i915/intel_drv.h     |  4 ++--
 4 files changed, 40 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
index f6d71590bd7b..a93ba2903018 100644
@@ -612,8 +612,8 @@ struct drm_i915_display_funcs {
 	/* display clock increase/decrease */
 	/* pll clock increase/decrease */
 
-	void (*load_csc_matrix)(struct drm_crtc *crtc);
-	void (*load_luts)(struct drm_crtc *crtc);
+	void (*load_csc_matrix)(struct drm_crtc_state *crtc_state);
+	void (*load_luts)(struct drm_crtc_state *crtc_state);
 };
 
 enum forcewake_domain_id {
drivers/gpu/drm/i915/intel_color.c +22 -21

125 lines not on this page · raw message

drivers/gpu/drm/i915/intel_display.c +14 -8
index 29aa64be1f03..4f913e5febf1 100644
@@ -3223,7 +3223,7 @@ static void intel_update_pipe_config(struct intel_crtc *crtc,
 		      pipe_config->pipe_src_w, pipe_config->pipe_src_h);
 
 	if (HAS_DDI(dev))
-		intel_color_set_csc(&crtc->base);
+		intel_color_set_csc(&pipe_config->base);
 
 	/*
 	 * Update pipe size and adjust fitter if needed: the reason for this is
@@ -4723,6 +4723,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_encoder *encoder;
 	int pipe = intel_crtc->pipe;
+	struct intel_crtc_state *pipe_config =
+		to_intel_crtc_state(crtc->state);
 
 	if (WARN_ON(intel_crtc->active))
 		return;
@@ -4770,7 +4772,7 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
 	 * On ILK+ LUT must be loaded before the pipe is running but with
 	 * clocks enabled
 	 */
-	intel_color_load_luts(crtc);
+	intel_color_load_luts(&pipe_config->base);
 
 	if (dev_priv->display.initial_watermarks != NULL)
 		dev_priv->display.initial_watermarks(intel_crtc->config);
@@ -4845,7 +4847,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
 
 	haswell_set_pipemisc(crtc);
 
-	intel_color_set_csc(crtc);
+	intel_color_set_csc(&pipe_config->base);
 
 	intel_crtc->active = true;
 
@@ -4874,7 +4876,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
 	 * On ILK+ LUT must be loaded before the pipe is running but with
 	 * clocks enabled
 	 */
-	intel_color_load_luts(crtc);
+	intel_color_load_luts(&pipe_config->base);
 
 	intel_ddi_set_pipe_settings(crtc);
 	if (!intel_crtc->config->has_dsi_encoder)
@@ -6035,6 +6037,8 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_encoder *encoder;
+	struct intel_crtc_state *pipe_config =
+		to_intel_crtc_state(crtc->state);
 	int pipe = intel_crtc->pipe;
 
 	if (WARN_ON(intel_crtc->active))
@@ -6079,7 +6083,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
 
 	i9xx_pfit_enable(intel_crtc);
 
-	intel_color_load_luts(crtc);
+	intel_color_load_luts(&pipe_config->base);
 
 	intel_update_watermarks(crtc);
 	intel_enable_pipe(intel_crtc);
@@ -6106,6 +6110,8 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_encoder *encoder;
+	struct intel_crtc_state *pipe_config =
+		to_intel_crtc_state(crtc->state);
 	int pipe = intel_crtc->pipe;
 
 	if (WARN_ON(intel_crtc->active))
@@ -6134,7 +6140,7 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
 
 	i9xx_pfit_enable(intel_crtc);
 
-	intel_color_load_luts(crtc);
+	intel_color_load_luts(&pipe_config->base);
 
 	intel_update_watermarks(crtc);
 	intel_enable_pipe(intel_crtc);
@@ -13605,8 +13611,8 @@ static int intel_atomic_commit(struct drm_device *dev,
 			 * a modeset as this will be done by
 			 * crtc_enable already.
 			 */
-			intel_color_set_csc(crtc);
-			intel_color_load_luts(crtc);
+			intel_color_set_csc(crtc->state);
+			intel_color_load_luts(crtc->state);
 		}
 
 		if (!modeset)
drivers/gpu/drm/i915/intel_drv.h +2 -2
index c87b4503435d..6ac46d921cde 100644
@@ -1669,7 +1669,7 @@ extern const struct drm_plane_helper_funcs intel_plane_helper_funcs;
 /* intel_color.c */
 void intel_color_init(struct drm_crtc *crtc);
 int intel_color_check(struct drm_crtc *crtc, struct drm_crtc_state *state);
-void intel_color_set_csc(struct drm_crtc *crtc);
-void intel_color_load_luts(struct drm_crtc *crtc);
+void intel_color_set_csc(struct drm_crtc_state *crtc_state);
+void intel_color_load_luts(struct drm_crtc_state *crtc_state);
 
 #endif /* __INTEL_DRV_H__ */
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] drm/i915: Pass crtc_state to color management functions.

Quoted 1 line · Maarten Lankhorst
Quoted 259 lines
---
  drivers/gpu/drm/i915/i915_drv.h      |  4 ++--
  drivers/gpu/drm/i915/intel_color.c   | 43 ++++++++++++++++++------------------
  drivers/gpu/drm/i915/intel_display.c | 22 +++++++++++-------
  drivers/gpu/drm/i915/intel_drv.h     |  4 ++--
  4 files changed, 40 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
index f6d71590bd7b..a93ba2903018 100644
@@ -612,8 +612,8 @@ struct drm_i915_display_funcs {
  	/* display clock increase/decrease */
  	/* pll clock increase/decrease */
 
-	void (*load_csc_matrix)(struct drm_crtc *crtc);
-	void (*load_luts)(struct drm_crtc *crtc);
+	void (*load_csc_matrix)(struct drm_crtc_state *crtc_state);
+	void (*load_luts)(struct drm_crtc_state *crtc_state);
  };
 
  enum forcewake_domain_id {
drivers/gpu/drm/i915/intel_color.c +22 -21
index aa0b20dcb834..9cffa638c351 100644
@@ -92,10 +92,10 @@ static void ctm_mult_by_limited(uint64_t *result, int64_t *input)
  }
 
  /* Set up the pipe CSC unit. */
-static void i9xx_load_csc_matrix(struct drm_crtc *crtc)
+static void i9xx_load_csc_matrix(struct drm_crtc_state *crtc_state)
  {
+	struct drm_crtc *crtc = crtc_state->crtc;
  	struct drm_device *dev = crtc->dev;
-	struct drm_crtc_state *crtc_state = crtc->state;
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
  	int i, pipe = intel_crtc->pipe;
@@ -203,10 +203,10 @@ static void i9xx_load_csc_matrix(struct drm_crtc *crtc)
  /*
   * Set up the pipe CSC unit on CherryView.
   */
-static void cherryview_load_csc_matrix(struct drm_crtc *crtc)
+static void cherryview_load_csc_matrix(struct drm_crtc_state *state)
  {
+	struct drm_crtc *crtc = state->crtc;
  	struct drm_device *dev = crtc->dev;
-	struct drm_crtc_state *state = crtc->state;
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	int pipe = to_intel_crtc(crtc)->pipe;
  	uint32_t mode;
@@ -252,13 +252,13 @@ static void cherryview_load_csc_matrix(struct drm_crtc *crtc)
  	I915_WRITE(CGM_PIPE_MODE(pipe), mode);
  }
 
-void intel_color_set_csc(struct drm_crtc *crtc)
+void intel_color_set_csc(struct drm_crtc_state *crtc_state)
  {
-	struct drm_device *dev = crtc->dev;
+	struct drm_device *dev = crtc_state->crtc->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
 
  	if (dev_priv->display.load_csc_matrix)
-		dev_priv->display.load_csc_matrix(crtc);
+		dev_priv->display.load_csc_matrix(crtc_state);
  }
 
  /* Loads the legacy palette/gamma unit for the CRTC. */
@@ -303,19 +303,20 @@ static void i9xx_load_luts_internal(struct drm_crtc *crtc,
  	}
  }
 
-static void i9xx_load_luts(struct drm_crtc *crtc)
+static void i9xx_load_luts(struct drm_crtc_state *crtc_state)
  {
-	i9xx_load_luts_internal(crtc, crtc->state->gamma_lut);
+	i9xx_load_luts_internal(crtc_state->crtc, crtc_state->gamma_lut);
  }
 
  /* Loads the legacy palette/gamma unit for the CRTC on Haswell. */
-static void haswell_load_luts(struct drm_crtc *crtc)
+static void haswell_load_luts(struct drm_crtc_state *crtc_state)
  {
+	struct drm_crtc *crtc = crtc_state->crtc;
  	struct drm_device *dev = crtc->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
  	struct intel_crtc_state *intel_crtc_state =
-		to_intel_crtc_state(crtc->state);
+		to_intel_crtc_state(crtc_state);
  	bool reenable_ips = false;
 
  	/*
@@ -331,24 +332,24 @@ static void haswell_load_luts(struct drm_crtc *crtc)
  	intel_crtc_state->gamma_mode = GAMMA_MODE_MODE_8BIT;
  	I915_WRITE(GAMMA_MODE(intel_crtc->pipe), GAMMA_MODE_MODE_8BIT);
 
-	i9xx_load_luts(crtc);
+	i9xx_load_luts(crtc_state);
 
  	if (reenable_ips)
  		hsw_enable_ips(intel_crtc);
  }
 
  /* Loads the palette/gamma unit for the CRTC on Broadwell+. */
-static void broadwell_load_luts(struct drm_crtc *crtc)
+static void broadwell_load_luts(struct drm_crtc_state *state)
  {
+	struct drm_crtc *crtc = state->crtc;
  	struct drm_device *dev = crtc->dev;
-	struct drm_crtc_state *state = crtc->state;
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct intel_crtc_state *intel_state = to_intel_crtc_state(state);
  	enum pipe pipe = to_intel_crtc(crtc)->pipe;
  	uint32_t i, lut_size = INTEL_INFO(dev)->color.degamma_lut_size;
 
  	if (crtc_state_is_legacy(state)) {
-		haswell_load_luts(crtc);
+		haswell_load_luts(state);
  		return;
  	}
 
@@ -421,11 +422,11 @@ static void broadwell_load_luts(struct drm_crtc *crtc)
  }
 
  /* Loads the palette/gamma unit for the CRTC on CherryView. */
-static void cherryview_load_luts(struct drm_crtc *crtc)
+static void cherryview_load_luts(struct drm_crtc_state *state)
  {
+	struct drm_crtc *crtc = state->crtc;
  	struct drm_device *dev = crtc->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct drm_crtc_state *state = crtc->state;
  	enum pipe pipe = to_intel_crtc(crtc)->pipe;
  	struct drm_color_lut *lut;
  	uint32_t i, lut_size;
@@ -481,16 +482,16 @@ static void cherryview_load_luts(struct drm_crtc *crtc)
  	i9xx_load_luts_internal(crtc, NULL);
  }
 
-void intel_color_load_luts(struct drm_crtc *crtc)
+void intel_color_load_luts(struct drm_crtc_state *crtc_state)
  {
-	struct drm_device *dev = crtc->dev;
+	struct drm_device *dev = crtc_state->crtc->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
 
  	/* The clocks have to be on to load the palette. */
-	if (!crtc->state->active)
+	if (!crtc_state->active)
  		return;
 
-	dev_priv->display.load_luts(crtc);
+	dev_priv->display.load_luts(crtc_state);
  }
 
  int intel_color_check(struct drm_crtc *crtc,
drivers/gpu/drm/i915/intel_display.c +14 -8
index 29aa64be1f03..4f913e5febf1 100644
@@ -3223,7 +3223,7 @@ static void intel_update_pipe_config(struct intel_crtc *crtc,
  		      pipe_config->pipe_src_w, pipe_config->pipe_src_h);
 
  	if (HAS_DDI(dev))
-		intel_color_set_csc(&crtc->base);
+		intel_color_set_csc(&pipe_config->base);
 
  	/*
  	 * Update pipe size and adjust fitter if needed: the reason for this is
@@ -4723,6 +4723,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
  	struct intel_encoder *encoder;
  	int pipe = intel_crtc->pipe;
+	struct intel_crtc_state *pipe_config =
+		to_intel_crtc_state(crtc->state);
 
  	if (WARN_ON(intel_crtc->active))
  		return;
@@ -4770,7 +4772,7 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
  	 * On ILK+ LUT must be loaded before the pipe is running but with
  	 * clocks enabled
  	 */
-	intel_color_load_luts(crtc);
+	intel_color_load_luts(&pipe_config->base);
 
  	if (dev_priv->display.initial_watermarks != NULL)
  		dev_priv->display.initial_watermarks(intel_crtc->config);
@@ -4845,7 +4847,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
 
  	haswell_set_pipemisc(crtc);
 
-	intel_color_set_csc(crtc);
+	intel_color_set_csc(&pipe_config->base);
 
  	intel_crtc->active = true;
 
@@ -4874,7 +4876,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
  	 * On ILK+ LUT must be loaded before the pipe is running but with
  	 * clocks enabled
  	 */
-	intel_color_load_luts(crtc);
+	intel_color_load_luts(&pipe_config->base);
 
  	intel_ddi_set_pipe_settings(crtc);
  	if (!intel_crtc->config->has_dsi_encoder)
@@ -6035,6 +6037,8 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
  	struct drm_i915_private *dev_priv = to_i915(dev);
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
  	struct intel_encoder *encoder;
+	struct intel_crtc_state *pipe_config =
+		to_intel_crtc_state(crtc->state);
  	int pipe = intel_crtc->pipe;
 
  	if (WARN_ON(intel_crtc->active))
@@ -6079,7 +6083,7 @@ static void valleyview_crtc_enable(struct drm_crtc *crtc)
 
  	i9xx_pfit_enable(intel_crtc);
 
-	intel_color_load_luts(crtc);
+	intel_color_load_luts(&pipe_config->base);
 
  	intel_update_watermarks(crtc);
  	intel_enable_pipe(intel_crtc);
@@ -6106,6 +6110,8 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
  	struct drm_i915_private *dev_priv = to_i915(dev);
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
  	struct intel_encoder *encoder;
+	struct intel_crtc_state *pipe_config =
+		to_intel_crtc_state(crtc->state);
  	int pipe = intel_crtc->pipe;
 
  	if (WARN_ON(intel_crtc->active))
@@ -6134,7 +6140,7 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
 
  	i9xx_pfit_enable(intel_crtc);
 
-	intel_color_load_luts(crtc);
+	intel_color_load_luts(&pipe_config->base);
 
  	intel_update_watermarks(crtc);
  	intel_enable_pipe(intel_crtc);
@@ -13605,8 +13611,8 @@ static int intel_atomic_commit(struct drm_device *dev,
  			 * a modeset as this will be done by
  			 * crtc_enable already.
  			 */
-			intel_color_set_csc(crtc);
-			intel_color_load_luts(crtc);
+			intel_color_set_csc(crtc->state);
+			intel_color_load_luts(crtc->state);
  		}
 
  		if (!modeset)
drivers/gpu/drm/i915/intel_drv.h +0 -0
index c87b4503435d..6ac46d921cde 100644

drivers/gpu/drm/i915/intel_drv.h extern const struct drm_plane_helper_funcs intel_plane_helper_funcs; · line 1675

Quoted 9 lines
drivers/gpu/drm/i915/intel_drv.h +2 -2
@@ -1669,7 +1669,7 @@ extern const struct drm_plane_helper_funcs intel_plane_helper_funcs;
  /* intel_color.c */
  void intel_color_init(struct drm_crtc *crtc);
  int intel_color_check(struct drm_crtc *crtc, struct drm_crtc_state *state);
-void intel_color_set_csc(struct drm_crtc *crtc);
-void intel_color_load_luts(struct drm_crtc *crtc);
+void intel_color_set_csc(struct drm_crtc_state *crtc_state);
+void intel_color_load_luts(struct drm_crtc_state *crtc_state);
 
  #endif /* __INTEL_DRV_H__ */

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

PATCH 2/3 drm/i915: Do not check crtc_state->active in intel_color_load_luts.

In reply to Maarten Lankhorst

This is already tested by its callers.

---
 drivers/gpu/drm/i915/intel_color.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_color.c +0 -4
index 9cffa638c351..1b3f97449395 100644
@@ -487,10 +487,6 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state)
 	struct drm_device *dev = crtc_state->crtc->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	/* The clocks have to be on to load the palette. */
-	if (!crtc_state->active)
-		return;
-
 	dev_priv->display.load_luts(crtc_state);
 }
 
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] drm/i915: Do not check crtc_state->active in intel_color_load_luts.

Quoted 3 lines · Maarten Lankhorst

This is already tested by its callers.

Quoted 9 lines
---
  drivers/gpu/drm/i915/intel_color.c | 4 ----
  1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_color.c +0 -0
index 9cffa638c351..1b3f97449395 100644

drivers/gpu/drm/i915/intel_color.c void intel_color_load_luts(struct drm_crtc_state *crtc_state) · line 492

Quoted 10 lines
drivers/gpu/drm/i915/intel_color.c +0 -4
@@ -487,10 +487,6 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state)
  	struct drm_device *dev = crtc_state->crtc->dev;
  	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	/* The clocks have to be on to load the palette. */
-	if (!crtc_state->active)
-		return;
-
  	dev_priv->display.load_luts(crtc_state);
  }
 

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

PATCH 3/3 drm/i915: Update color management during vblank evasion.

In reply to Maarten Lankhorst

Without this a vblank may occur between updating color management and planes, which should be prevented.

intel_color_set_csc was called in update pipe config because the handover from hardware may not have any csc set, which resulted in a black screen. Because of this also update color management during fastset.

---
 drivers/gpu/drm/i915/intel_display.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_display.c +10 -15
index 4f913e5febf1..179461b45ce3 100644
@@ -3222,9 +3222,6 @@ static void intel_update_pipe_config(struct intel_crtc *crtc,
 		      old_crtc_state->pipe_src_w, old_crtc_state->pipe_src_h,
 		      pipe_config->pipe_src_w, pipe_config->pipe_src_h);
 
-	if (HAS_DDI(dev))
-		intel_color_set_csc(&pipe_config->base);
-
 	/*
 	 * Update pipe size and adjust fitter if needed: the reason for this is
 	 * that in compute_mode_changes we check the native mode (not the pfit
@@ -13603,18 +13600,6 @@ static int intel_atomic_commit(struct drm_device *dev,
 			dev_priv->display.crtc_enable(crtc);
 		}
 
-		if (!modeset &&
-		    crtc->state->active &&
-		    crtc->state->color_mgmt_changed) {
-			/*
-			 * Only update color management when not doing
-			 * a modeset as this will be done by
-			 * crtc_enable already.
-			 */
-			intel_color_set_csc(crtc->state);
-			intel_color_load_luts(crtc->state);
-		}
-
 		if (!modeset)
 			intel_pre_plane_update(to_intel_crtc_state(old_crtc_state));
 
@@ -13933,6 +13918,16 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
 	if (modeset)
 		return;
 
+	if (crtc->state->color_mgmt_changed || to_intel_crtc_state(crtc->state)->update_pipe) {
+		/*
+		 * Only update color management when not doing
+		 * a modeset as this will be done by
+		 * crtc_enable already.
+		 */
+		intel_color_set_csc(crtc->state);
+		intel_color_load_luts(crtc->state);
+	}
+
 	if (to_intel_crtc_state(crtc->state)->update_pipe)
 		intel_update_pipe_config(intel_crtc, old_intel_state);
 	else if (INTEL_INFO(dev)->gen >= 9)
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 3/3
#6 lore raw

Re: [PATCH 3/3] drm/i915: Update color management during vblank evasion.

Quoted 9 lines · Maarten Lankhorst

Without this a vblank may occur between updating color management and planes, which should be prevented.

intel_color_set_csc was called in update pipe config because the handover from hardware may not have any csc set, which resulted in a black screen. Because of this also update color management during fastset.

Quoted 38 lines
---
  drivers/gpu/drm/i915/intel_display.c | 25 ++++++++++---------------
  1 file changed, 10 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -15
index 4f913e5febf1..179461b45ce3 100644
@@ -3222,9 +3222,6 @@ static void intel_update_pipe_config(struct intel_crtc *crtc,
  		      old_crtc_state->pipe_src_w, old_crtc_state->pipe_src_h,
  		      pipe_config->pipe_src_w, pipe_config->pipe_src_h);
 
-	if (HAS_DDI(dev))
-		intel_color_set_csc(&pipe_config->base);
-
  	/*
  	 * Update pipe size and adjust fitter if needed: the reason for this is
  	 * that in compute_mode_changes we check the native mode (not the pfit
@@ -13603,18 +13600,6 @@ static int intel_atomic_commit(struct drm_device *dev,
  			dev_priv->display.crtc_enable(crtc);
  		}
 
-		if (!modeset &&
-		    crtc->state->active &&
-		    crtc->state->color_mgmt_changed) {
-			/*
-			 * Only update color management when not doing
-			 * a modeset as this will be done by
-			 * crtc_enable already.
-			 */
-			intel_color_set_csc(crtc->state);
-			intel_color_load_luts(crtc->state);
-		}
-
  		if (!modeset)
  			intel_pre_plane_update(to_intel_crtc_state(old_crtc_state));
 

drivers/gpu/drm/i915/intel_display.c static void intel_begin_crtc_commit(struct drm_crtc *crtc, · line 13926

Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +6 -0
@@ -13933,6 +13918,16 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
  	if (modeset)
  		return;
 
+	if (crtc->state->color_mgmt_changed || to_intel_crtc_state(crtc->state)->update_pipe) {
+		/*
+		 * Only update color management when not doing
+		 * a modeset as this will be done by
+		 * crtc_enable already.
+		 */

I guess we can drop this comment.

drivers/gpu/drm/i915/intel_display.c static void intel_begin_crtc_commit(struct drm_crtc *crtc, · line 13933

Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +4 -0
+		intel_color_set_csc(crtc->state);
+		intel_color_load_luts(crtc->state);
+	}
+
  	if (to_intel_crtc_state(crtc->state)->update_pipe)
  		intel_update_pipe_config(intel_crtc, old_intel_state);
  	else if (INTEL_INFO(dev)->gen >= 9)

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by
#7 lore raw

Re: [PATCH 3/3] drm/i915: Update color management during vblank evasion.

Quoted 11 lines · Lionel Landwerlin
Quoted 9 lines · Maarten Lankhorst

Without this a vblank may occur between updating color management and planes, which should be prevented.

intel_color_set_csc was called in update pipe config because the handover from hardware may not have any csc set, which resulted in a black screen. Because of this also update color management during fastset.

Quoted 59 lines
Quoted 45 lines
---
  drivers/gpu/drm/i915/intel_display.c | 25 ++++++++++---------------
  1 file changed, 10 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -2
index 4f913e5febf1..179461b45ce3 100644
@@ -3222,9 +3222,6 @@ static void intel_update_pipe_config(struct 
 intel_crtc *crtc,
                old_crtc_state->pipe_src_w, old_crtc_state->pipe_src_h,
                pipe_config->pipe_src_w, pipe_config->pipe_src_h);
  -    if (HAS_DDI(dev))
-        intel_color_set_csc(&pipe_config->base);
-
      /*
       * Update pipe size and adjust fitter if needed: the reason for 

this is
* that in compute_mode_changes we check the native mode (not
the pfit

drivers/gpu/drm/i915/intel_display.c +0 -11
@@ -13603,18 +13600,6 @@ static int intel_atomic_commit(struct 
 drm_device *dev,
              dev_priv->display.crtc_enable(crtc);
          }
  -        if (!modeset &&
-            crtc->state->active &&
-            crtc->state->color_mgmt_changed) {
-            /*
-             * Only update color management when not doing
-             * a modeset as this will be done by
-             * crtc_enable already.
-             */
-            intel_color_set_csc(crtc->state);
-            intel_color_load_luts(crtc->state);
-        }
-
          if (!modeset)
 intel_pre_plane_update(to_intel_crtc_state(old_crtc_state));
  @@ -13933,6 +13918,16 @@ static void intel_begin_crtc_commit(struct 

drm_crtc *crtc,

      if (modeset)
          return;

+ if (crtc->state->color_mgmt_changed ||
to_intel_crtc_state(crtc->state)->update_pipe) {

drivers/gpu/drm/i915/intel_display.c static void intel_begin_crtc_commit(struct drm_crtc *crtc, · line 13926

Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +5 -0
+        /*
+         * Only update color management when not doing
+         * a modeset as this will be done by
+         * crtc_enable already.
+         */

I guess we can drop this comment.

drivers/gpu/drm/i915/intel_display.c static void intel_begin_crtc_commit(struct drm_crtc *crtc, · line 13933

Quoted 7 lines

+ intel_color_set_csc(crtc->state);

drivers/gpu/drm/i915/intel_display.c +3 -0
+        intel_color_load_luts(crtc->state);
+    }
+
      if (to_intel_crtc_state(crtc->state)->update_pipe)
          intel_update_pipe_config(intel_crtc, old_intel_state);
      else if (INTEL_INFO(dev)->gen >= 9)
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by
#8 lore raw

Re: [PATCH 3/3] drm/i915: Update color management during vblank evasion.

In reply to Lionel Landwerlin
Quoted 11 lines · Lionel Landwerlin
Quoted 9 lines · Maarten Lankhorst

Without this a vblank may occur between updating color management and planes, which should be prevented.

intel_color_set_csc was called in update pipe config because the handover from hardware may not have any csc set, which resulted in a black screen. Because of this also update color management during fastset.

Quoted 59 lines
Quoted 45 lines
---
  drivers/gpu/drm/i915/intel_display.c | 25 ++++++++++---------------
  1 file changed, 10 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -2
index 4f913e5febf1..179461b45ce3 100644
@@ -3222,9 +3222,6 @@ static void intel_update_pipe_config(struct 
 intel_crtc *crtc,
                old_crtc_state->pipe_src_w, old_crtc_state->pipe_src_h,
                pipe_config->pipe_src_w, pipe_config->pipe_src_h);
  -    if (HAS_DDI(dev))
-        intel_color_set_csc(&pipe_config->base);
-
      /*
       * Update pipe size and adjust fitter if needed: the reason for 

this is
* that in compute_mode_changes we check the native mode (not
the pfit

drivers/gpu/drm/i915/intel_display.c +0 -11
@@ -13603,18 +13600,6 @@ static int intel_atomic_commit(struct 
 drm_device *dev,
              dev_priv->display.crtc_enable(crtc);
          }
  -        if (!modeset &&
-            crtc->state->active &&
-            crtc->state->color_mgmt_changed) {
-            /*
-             * Only update color management when not doing
-             * a modeset as this will be done by
-             * crtc_enable already.
-             */
-            intel_color_set_csc(crtc->state);
-            intel_color_load_luts(crtc->state);
-        }
-
          if (!modeset)
 intel_pre_plane_update(to_intel_crtc_state(old_crtc_state));
  @@ -13933,6 +13918,16 @@ static void intel_begin_crtc_commit(struct 

drm_crtc *crtc,

      if (modeset)
          return;

+ if (crtc->state->color_mgmt_changed ||
to_intel_crtc_state(crtc->state)->update_pipe) {

drivers/gpu/drm/i915/intel_display.c static void intel_begin_crtc_commit(struct drm_crtc *crtc, · line 13926

Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +5 -0
+        /*
+         * Only update color management when not doing
+         * a modeset as this will be done by
+         * crtc_enable already.
+         */

I guess we can drop this comment.

drivers/gpu/drm/i915/intel_display.c static void intel_begin_crtc_commit(struct drm_crtc *crtc, · line 13933

Quoted 7 lines

+ intel_color_set_csc(crtc->state);

drivers/gpu/drm/i915/intel_display.c +3 -0
+        intel_color_load_luts(crtc->state);
+    }
+
      if (to_intel_crtc_state(crtc->state)->update_pipe)
          intel_update_pipe_config(intel_crtc, old_intel_state);
      else if (INTEL_INFO(dev)->gen >= 9)
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx