[Intel-gfx] [PATCH 7/9] drm/i915: Move some variables to tighter scope

[Ville Syrjälä]

On Mon, Mar 18, 2019 at 05:10:49PM -0700, Matt Roper wrote:
> On Tue, Mar 12, 2019 at 10:58:42PM +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > 
> > Clean up skl_allocate_pipe_ddb() a bit by moving the 'wm' variable
> > to tighter scope. We'll also consitify it where appropriate.
> > 
> > Cc: Neel Desai <neel.desai at intel.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_pm.c | 23 +++++++++++++----------
> >  1 file changed, 13 insertions(+), 10 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index 8afbc56ad89a..b958a1a00014 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -4336,7 +4336,6 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
> >  	struct drm_i915_private *dev_priv = to_i915(crtc->dev);
> >  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> >  	struct skl_ddb_entry *alloc = &cstate->wm.skl.ddb;
> > -	struct skl_plane_wm *wm;
> >  	u16 alloc_size, start = 0;
> >  	u16 total[I915_MAX_PLANES] = {};
> >  	u16 uv_total[I915_MAX_PLANES] = {};
> > @@ -4393,7 +4392,8 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
> >  	for (level = ilk_wm_max_level(dev_priv); level >= 0; level--) {
> >  		blocks = 0;
> >  		for_each_plane_id_on_crtc(intel_crtc, plane_id) {
> > -			wm = &cstate->wm.skl.optimal.planes[plane_id];
> > +			const struct skl_plane_wm *wm =
> > +				&cstate->wm.skl.optimal.planes[plane_id];
> >  
> >  			if (plane_id == PLANE_CURSOR) {
> >  				if (WARN_ON(wm->wm[level].min_ddb_alloc >
> > @@ -4427,6 +4427,8 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
> >  	 * proportional to its relative data rate.
> >  	 */
> >  	for_each_plane_id_on_crtc(intel_crtc, plane_id) {
> > +		const struct skl_plane_wm *wm =
> > +			&cstate->wm.skl.optimal.planes[plane_id];
> >  		u64 rate;
> >  		u16 extra;
> >  
> > @@ -4440,8 +4442,6 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
> >  		if (total_data_rate == 0)
> >  			break;
> >  
> > -		wm = &cstate->wm.skl.optimal.planes[plane_id];
> > -
> >  		rate = plane_data_rate[plane_id];
> >  		extra = min_t(u16, alloc_size,
> >  			      DIV64_U64_ROUND_UP(alloc_size * rate,
> > @@ -4466,14 +4466,14 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
> >  	/* Set the actual DDB start/end points for each plane */
> >  	start = alloc->start;
> >  	for_each_plane_id_on_crtc(intel_crtc, plane_id) {
> > -		struct skl_ddb_entry *plane_alloc, *uv_plane_alloc;
> > +		struct skl_ddb_entry *plane_alloc =
> > +			&cstate->wm.skl.plane_ddb_y[plane_id];
> > +		struct skl_ddb_entry *uv_plane_alloc =
> > +			&cstate->wm.skl.plane_ddb_uv[plane_id];
> >  
> >  		if (plane_id == PLANE_CURSOR)
> >  			continue;
> >  
> > -		plane_alloc = &cstate->wm.skl.plane_ddb_y[plane_id];
> > -		uv_plane_alloc = &cstate->wm.skl.plane_ddb_uv[plane_id];
> > -
> >  		/* Gen11+ uses a separate plane for UV watermarks */
> >  		WARN_ON(INTEL_GEN(dev_priv) >= 11 && uv_total[plane_id]);
> >  
> 
> This hunk is fine, but isn't what's described in the commit message.
> Maybe throw an extra sentence in there referencing this change?

Amended the commit message a bit, and fixed up the update vs. build
typo in the commit message of the other patch.

Series pushed to dinq. Thanks for the review.

> 
> Aside from that,
> 
> Reviewed-by: Matt Roper <matthew.d.roper at intel.com>
> 
> > @@ -4499,7 +4499,8 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
> >  	 */
> >  	for (level++; level <= ilk_wm_max_level(dev_priv); level++) {
> >  		for_each_plane_id_on_crtc(intel_crtc, plane_id) {
> > -			wm = &cstate->wm.skl.optimal.planes[plane_id];
> > +			struct skl_plane_wm *wm =
> > +				&cstate->wm.skl.optimal.planes[plane_id];
> >  
> >  			/*
> >  			 * We only disable the watermarks for each plane if
> > @@ -4535,7 +4536,9 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,
> >  	 * don't have enough DDB blocks for it.
> >  	 */
> >  	for_each_plane_id_on_crtc(intel_crtc, plane_id) {
> > -		wm = &cstate->wm.skl.optimal.planes[plane_id];
> > +		struct skl_plane_wm *wm =
> > +			&cstate->wm.skl.optimal.planes[plane_id];
> > +
> >  		if (wm->trans_wm.plane_res_b >= total[plane_id])
> >  			memset(&wm->trans_wm, 0, sizeof(wm->trans_wm));
> >  	}
> > -- 
> > 2.19.2
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Matt Roper
> Graphics Software Engineer
> IoTG Platform Enabling & Development
> Intel Corporation
> (916) 356-2795

-- 
Ville Syrjälä
Intel