diff mbox

[08/13] drm/i915: Move active watermarks into CRTC state (v2)

Message ID 1440119524-13867-9-git-send-email-matthew.d.roper@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Matt Roper Aug. 21, 2015, 1:11 a.m. UTC 
Since we allocate a few CRTC states on the stack, also switch the 'wm'
struct here to be a union so that we're not wasting stack space with
other platforms' watermark values.

v2: Don't move cxsr_allowed to state (Maarten)

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
 drivers/gpu/drm/i915/intel_drv.h | 45 +++++++++++++++++++++++-----------------
 drivers/gpu/drm/i915/intel_pm.c  | 30 ++++++++++++++++-----------
 2 files changed, 44 insertions(+), 31 deletions(-)

Comments

Ville Syrjälä Aug. 26, 2015, 1:10 p.m. UTC | #1 
On Thu, Aug 20, 2015 at 06:11:59PM -0700, Matt Roper wrote:
> Since we allocate a few CRTC states on the stack, also switch the 'wm'
> struct here to be a union so that we're not wasting stack space with
> other platforms' watermark values.
> 

I don't like this patch. The locking rules (once we have the vblank
update machinery and wm.mutex) will be totally different for the active
wms vs. the crtc state. So this would need to reverted when we add the
vblank wm machinery.

That's at least for ILK+. Not sure about SKL since I've not really
thought about it so far.

> v2: Don't move cxsr_allowed to state (Maarten)
> 
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_drv.h | 45 +++++++++++++++++++++++-----------------
>  drivers/gpu/drm/i915/intel_pm.c  | 30 ++++++++++++++++-----------
>  2 files changed, 44 insertions(+), 31 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 65f0171..dfbfba9 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -323,6 +323,21 @@ struct intel_crtc_scaler_state {
>  /* drm_mode->private_flags */
>  #define I915_MODE_FLAG_INHERITED 1
>  
> +struct intel_pipe_wm {
> +	struct intel_wm_level wm[5];
> +	uint32_t linetime;
> +	bool fbc_wm_enabled;
> +	bool pipe_enabled;
> +	bool sprites_enabled;
> +	bool sprites_scaled;
> +};
> +
> +struct skl_pipe_wm {
> +	struct skl_wm_level wm[8];
> +	struct skl_wm_level trans_wm;
> +	uint32_t linetime;
> +};
> +
>  struct intel_crtc_state {
>  	struct drm_crtc_state base;
>  
> @@ -458,6 +473,17 @@ struct intel_crtc_state {
>  
>  	/* IVB sprite scaling w/a (WaCxSRDisabledForSpriteScaling:ivb) */
>  	bool disable_lp_wm;
> +
> +	struct {
> +		/*
> +		 * final watermarks, programmed post-vblank when this state
> +		 * is committed
> +		 */
> +		union {
> +			struct intel_pipe_wm ilk;
> +			struct skl_pipe_wm skl;
> +		} active;
> +	} wm;
>  };
>  
>  struct vlv_wm_state {
> @@ -469,15 +495,6 @@ struct vlv_wm_state {
>  	bool cxsr;
>  };
>  
> -struct intel_pipe_wm {
> -	struct intel_wm_level wm[5];
> -	uint32_t linetime;
> -	bool fbc_wm_enabled;
> -	bool pipe_enabled;
> -	bool sprites_enabled;
> -	bool sprites_scaled;
> -};
> -
>  struct intel_mmio_flip {
>  	struct work_struct work;
>  	struct drm_i915_private *i915;
> @@ -485,12 +502,6 @@ struct intel_mmio_flip {
>  	struct intel_crtc *crtc;
>  };
>  
> -struct skl_pipe_wm {
> -	struct skl_wm_level wm[8];
> -	struct skl_wm_level trans_wm;
> -	uint32_t linetime;
> -};
> -
>  /*
>   * Tracking of operations that need to be performed at the beginning/end of an
>   * atomic commit, outside the atomic section where interrupts are disabled.
> @@ -555,10 +566,6 @@ struct intel_crtc {
>  
>  	/* per-pipe watermark state */
>  	struct {
> -		/* watermarks currently being used  */
> -		struct intel_pipe_wm active;
> -		/* SKL wm values currently in use */
> -		struct skl_pipe_wm skl_active;
>  		/* allow CxSR on this pipe */
>  		bool cxsr_allowed;
>  	} wm;
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 5b79c2f..04fc092 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2345,7 +2345,9 @@ static void ilk_compute_wm_config(struct drm_device *dev,
>  
>  	/* Compute the currently _active_ config */
>  	for_each_intel_crtc(dev, intel_crtc) {
> -		const struct intel_pipe_wm *wm = &intel_crtc->wm.active;
> +		const struct intel_crtc_state *cstate =
> +			to_intel_crtc_state(intel_crtc->base.state);
> +		const struct intel_pipe_wm *wm = &cstate->wm.active.ilk;
>  
>  		if (!wm->pipe_enabled)
>  			continue;
> @@ -2442,7 +2444,9 @@ static void ilk_merge_wm_level(struct drm_device *dev,
>  	ret_wm->enable = true;
>  
>  	for_each_intel_crtc(dev, intel_crtc) {
> -		const struct intel_pipe_wm *active = &intel_crtc->wm.active;
> +		const struct intel_crtc_state *cstate =
> +			to_intel_crtc_state(intel_crtc->base.state);
> +		const struct intel_pipe_wm *active = &cstate->wm.active.ilk;
>  		const struct intel_wm_level *wm = &active->wm[level];
>  
>  		if (!active->pipe_enabled)
> @@ -2590,14 +2594,15 @@ static void ilk_compute_wm_results(struct drm_device *dev,
>  
>  	/* LP0 register values */
>  	for_each_intel_crtc(dev, intel_crtc) {
> +		const struct intel_crtc_state *cstate =
> +			to_intel_crtc_state(intel_crtc->base.state);
>  		enum pipe pipe = intel_crtc->pipe;
> -		const struct intel_wm_level *r =
> -			&intel_crtc->wm.active.wm[0];
> +		const struct intel_wm_level *r = &cstate->wm.active.ilk.wm[0];
>  
>  		if (WARN_ON(!r->enable))
>  			continue;
>  
> -		results->wm_linetime[pipe] = intel_crtc->wm.active.linetime;
> +		results->wm_linetime[pipe] = cstate->wm.active.ilk.linetime;
>  
>  		results->wm_pipe[pipe] =
>  			(r->pri_val << WM0_PIPE_PLANE_SHIFT) |
> @@ -3564,16 +3569,15 @@ static bool skl_update_pipe_wm(struct drm_crtc *crtc,
>  			       struct skl_ddb_allocation *ddb, /* out */
>  			       struct skl_pipe_wm *pipe_wm /* out */)
>  {
> -	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>  	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
>  
>  	skl_allocate_pipe_ddb(crtc, config, cstate, ddb);
>  	skl_compute_pipe_wm(crtc, ddb, cstate, pipe_wm);
>  
> -	if (!memcmp(&intel_crtc->wm.skl_active, pipe_wm, sizeof(*pipe_wm)))
> +	if (!memcmp(&cstate->wm.active.skl, pipe_wm, sizeof(*pipe_wm)))
>  		return false;
>  
> -	intel_crtc->wm.skl_active = *pipe_wm;
> +	cstate->wm.active.skl = *pipe_wm;
>  
>  	return true;
>  }
> @@ -3706,10 +3710,10 @@ static void ilk_update_wm(struct drm_crtc *crtc)
>  
>  	intel_compute_pipe_wm(cstate, &pipe_wm);
>  
> -	if (!memcmp(&intel_crtc->wm.active, &pipe_wm, sizeof(pipe_wm)))
> +	if (!memcmp(&cstate->wm.active.ilk, &pipe_wm, sizeof(pipe_wm)))
>  		return;
>  
> -	intel_crtc->wm.active = pipe_wm;
> +	cstate->wm.active.ilk = pipe_wm;
>  
>  	ilk_program_watermarks(dev_priv);
>  }
> @@ -3764,7 +3768,8 @@ static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc)
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct skl_wm_values *hw = &dev_priv->wm.skl_hw;
>  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> -	struct skl_pipe_wm *active = &intel_crtc->wm.skl_active;
> +	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
> +	struct skl_pipe_wm *active = &cstate->wm.active.skl;
>  	enum pipe pipe = intel_crtc->pipe;
>  	int level, i, max_level;
>  	uint32_t temp;
> @@ -3827,7 +3832,8 @@ static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc)
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct ilk_wm_values *hw = &dev_priv->wm.hw;
>  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> -	struct intel_pipe_wm *active = &intel_crtc->wm.active;
> +	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
> +	struct intel_pipe_wm *active = &cstate->wm.active.ilk;
>  	enum pipe pipe = intel_crtc->pipe;
>  	static const unsigned int wm0_pipe_reg[] = {
>  		[PIPE_A] = WM0_PIPEA_ILK,
> -- 
> 2.1.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 65f0171..dfbfba9 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -323,6 +323,21 @@  struct intel_crtc_scaler_state {
 /* drm_mode->private_flags */
 #define I915_MODE_FLAG_INHERITED 1
 
+struct intel_pipe_wm {
+	struct intel_wm_level wm[5];
+	uint32_t linetime;
+	bool fbc_wm_enabled;
+	bool pipe_enabled;
+	bool sprites_enabled;
+	bool sprites_scaled;
+};
+
+struct skl_pipe_wm {
+	struct skl_wm_level wm[8];
+	struct skl_wm_level trans_wm;
+	uint32_t linetime;
+};
+
 struct intel_crtc_state {
 	struct drm_crtc_state base;
 
@@ -458,6 +473,17 @@  struct intel_crtc_state {
 
 	/* IVB sprite scaling w/a (WaCxSRDisabledForSpriteScaling:ivb) */
 	bool disable_lp_wm;
+
+	struct {
+		/*
+		 * final watermarks, programmed post-vblank when this state
+		 * is committed
+		 */
+		union {
+			struct intel_pipe_wm ilk;
+			struct skl_pipe_wm skl;
+		} active;
+	} wm;
 };
 
 struct vlv_wm_state {
@@ -469,15 +495,6 @@  struct vlv_wm_state {
 	bool cxsr;
 };
 
-struct intel_pipe_wm {
-	struct intel_wm_level wm[5];
-	uint32_t linetime;
-	bool fbc_wm_enabled;
-	bool pipe_enabled;
-	bool sprites_enabled;
-	bool sprites_scaled;
-};
-
 struct intel_mmio_flip {
 	struct work_struct work;
 	struct drm_i915_private *i915;
@@ -485,12 +502,6 @@  struct intel_mmio_flip {
 	struct intel_crtc *crtc;
 };
 
-struct skl_pipe_wm {
-	struct skl_wm_level wm[8];
-	struct skl_wm_level trans_wm;
-	uint32_t linetime;
-};
-
 /*
  * Tracking of operations that need to be performed at the beginning/end of an
  * atomic commit, outside the atomic section where interrupts are disabled.
@@ -555,10 +566,6 @@  struct intel_crtc {
 
 	/* per-pipe watermark state */
 	struct {
-		/* watermarks currently being used  */
-		struct intel_pipe_wm active;
-		/* SKL wm values currently in use */
-		struct skl_pipe_wm skl_active;
 		/* allow CxSR on this pipe */
 		bool cxsr_allowed;
 	} wm;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 5b79c2f..04fc092 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2345,7 +2345,9 @@  static void ilk_compute_wm_config(struct drm_device *dev,
 
 	/* Compute the currently _active_ config */
 	for_each_intel_crtc(dev, intel_crtc) {
-		const struct intel_pipe_wm *wm = &intel_crtc->wm.active;
+		const struct intel_crtc_state *cstate =
+			to_intel_crtc_state(intel_crtc->base.state);
+		const struct intel_pipe_wm *wm = &cstate->wm.active.ilk;
 
 		if (!wm->pipe_enabled)
 			continue;
@@ -2442,7 +2444,9 @@  static void ilk_merge_wm_level(struct drm_device *dev,
 	ret_wm->enable = true;
 
 	for_each_intel_crtc(dev, intel_crtc) {
-		const struct intel_pipe_wm *active = &intel_crtc->wm.active;
+		const struct intel_crtc_state *cstate =
+			to_intel_crtc_state(intel_crtc->base.state);
+		const struct intel_pipe_wm *active = &cstate->wm.active.ilk;
 		const struct intel_wm_level *wm = &active->wm[level];
 
 		if (!active->pipe_enabled)
@@ -2590,14 +2594,15 @@  static void ilk_compute_wm_results(struct drm_device *dev,
 
 	/* LP0 register values */
 	for_each_intel_crtc(dev, intel_crtc) {
+		const struct intel_crtc_state *cstate =
+			to_intel_crtc_state(intel_crtc->base.state);
 		enum pipe pipe = intel_crtc->pipe;
-		const struct intel_wm_level *r =
-			&intel_crtc->wm.active.wm[0];
+		const struct intel_wm_level *r = &cstate->wm.active.ilk.wm[0];
 
 		if (WARN_ON(!r->enable))
 			continue;
 
-		results->wm_linetime[pipe] = intel_crtc->wm.active.linetime;
+		results->wm_linetime[pipe] = cstate->wm.active.ilk.linetime;
 
 		results->wm_pipe[pipe] =
 			(r->pri_val << WM0_PIPE_PLANE_SHIFT) |
@@ -3564,16 +3569,15 @@  static bool skl_update_pipe_wm(struct drm_crtc *crtc,
 			       struct skl_ddb_allocation *ddb, /* out */
 			       struct skl_pipe_wm *pipe_wm /* out */)
 {
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
 
 	skl_allocate_pipe_ddb(crtc, config, cstate, ddb);
 	skl_compute_pipe_wm(crtc, ddb, cstate, pipe_wm);
 
-	if (!memcmp(&intel_crtc->wm.skl_active, pipe_wm, sizeof(*pipe_wm)))
+	if (!memcmp(&cstate->wm.active.skl, pipe_wm, sizeof(*pipe_wm)))
 		return false;
 
-	intel_crtc->wm.skl_active = *pipe_wm;
+	cstate->wm.active.skl = *pipe_wm;
 
 	return true;
 }
@@ -3706,10 +3710,10 @@  static void ilk_update_wm(struct drm_crtc *crtc)
 
 	intel_compute_pipe_wm(cstate, &pipe_wm);
 
-	if (!memcmp(&intel_crtc->wm.active, &pipe_wm, sizeof(pipe_wm)))
+	if (!memcmp(&cstate->wm.active.ilk, &pipe_wm, sizeof(pipe_wm)))
 		return;
 
-	intel_crtc->wm.active = pipe_wm;
+	cstate->wm.active.ilk = pipe_wm;
 
 	ilk_program_watermarks(dev_priv);
 }
@@ -3764,7 +3768,8 @@  static void skl_pipe_wm_get_hw_state(struct drm_crtc *crtc)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct skl_wm_values *hw = &dev_priv->wm.skl_hw;
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-	struct skl_pipe_wm *active = &intel_crtc->wm.skl_active;
+	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
+	struct skl_pipe_wm *active = &cstate->wm.active.skl;
 	enum pipe pipe = intel_crtc->pipe;
 	int level, i, max_level;
 	uint32_t temp;
@@ -3827,7 +3832,8 @@  static void ilk_pipe_wm_get_hw_state(struct drm_crtc *crtc)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct ilk_wm_values *hw = &dev_priv->wm.hw;
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-	struct intel_pipe_wm *active = &intel_crtc->wm.active;
+	struct intel_crtc_state *cstate = to_intel_crtc_state(crtc->state);
+	struct intel_pipe_wm *active = &cstate->wm.active.ilk;
 	enum pipe pipe = intel_crtc->pipe;
 	static const unsigned int wm0_pipe_reg[] = {
 		[PIPE_A] = WM0_PIPEA_ILK,