[Intel-gfx] [PATCH 06/11] drm/i915/skl+: unify cpp value in WM calculation

[Maarten Lankhorst]

Op 05-07-17 om 16:31 schreef Mahesh Kumar:
> From: "Kumar, Mahesh" <mahesh1.kumar at intel.com>
>
> use same cpp value in different phase of plane WM caluclation.
>
> Signed-off-by: Mahesh Kumar <mahesh1.kumar at intel.com>
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 9e2ca70bed5d..9753210d79ae 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4399,13 +4399,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
>  		width = drm_rect_width(&intel_pstate->base.src) >> 16;
>  	}
>  
> -	cpp = fb->format->cpp[0];
> +	cpp = (fb->format->format == DRM_FORMAT_NV12) ? fb->format->cpp[1] :
> +							fb->format->cpp[0];
>  	plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate);
>  
>  	if (drm_rotation_90_or_270(pstate->rotation)) {
> -		int cpp = (fb->format->format == DRM_FORMAT_NV12) ?
> -			fb->format->cpp[1] :
> -			fb->format->cpp[0];
>  
>  		switch (cpp) {
>  		case 1:

First 6 patches pushed, thanks.

I'll take a closer look at the other patches on monday. :)