drm/i915/skl: Correctly updating sprite wm parameter

Sonika Jindal · danvet · commit a712f8ebf803 · 2014-12-15T11:25:28.000+01:00
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 &lt;sonika.jindal@intel.com&gt;
Reviewed-by: Tvrtko Ursulin &lt;tvrtko.ursulin@intel.com&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
@@ -2668,7 +2668,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;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -2668,7 +2668,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc,`
`2668`	`2668`	`list_for_each_entry(plane, &dev->mode_config.plane_list, head) {`
`2669`	`2669`	`struct intel_plane *intel_plane = to_intel_plane(plane);`
`2670`	`2670`
`2671`		`- if (intel_plane->pipe == pipe)`
	`2671`	`+ if (intel_plane->pipe == pipe &&`
	`2672`	`+ plane->type == DRM_PLANE_TYPE_OVERLAY)`
`2672`	`2673`	`p->plane[i++] = intel_plane->wm;`
`2673`	`2674`	`}`
`2674`	`2675`	`}`