[Intel-gfx] [PATCH] drm/i915/skl: Correctly updating sprite wm parameter

[Daniel Vetter]

On Tue, Dec 09, 2014 at 10:59:15AM +0530, sonika.jindal at intel.com wrote:
> From: Sonika Jindal <sonika.jindal at intel.com>
> 
> The pipe wm parameters is not correctly updated with sprite parameters
> because it copies them for each plane from plane_list to the sprite
> offset in pipe wm parameters. Since plane_list also contains primary and
> cursor planes, we end up updating wrong params for sprites.
> 
> Signed-off-by: Sonika Jindal <sonika.jindal at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_pm.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 8d182a6..4a16f9b 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3301,7 +3301,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,
>  	list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
>  		struct intel_plane *intel_plane = to_intel_plane(plane);
>  
> -		if (intel_plane->pipe == pipe)
> +		if (intel_plane->pipe == pipe &&
> +			plane->type == DRM_PLANE_TYPE_OVERLAY)
>  			p->plane[i++] = intel_plane->wm;
>  	}
>  }

With the great unification of planes both in hw with skl+ and in software
(with Matt's recent work): Can't we just ditch the cursor/primary plane
special cases?
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch