While the SKL versions of update_plane() and disable_plane() have been fixed before hitting upstream, the colorkey vfuncs have been left behind and so register writes for sprite 0 were landing on plane 0 (primary plane) instead of plane 1. Signed-off-by: Damien Lespiau <damien.lespiau@xxxxxxxxx> --- drivers/gpu/drm/i915/intel_sprite.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index f2d408d..9bd5e28 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -308,7 +308,7 @@ skl_update_colorkey(struct drm_plane *drm_plane, struct drm_i915_private *dev_priv = dev->dev_private; struct intel_plane *intel_plane = to_intel_plane(drm_plane); const int pipe = intel_plane->pipe; - const int plane = intel_plane->plane; + const int plane = intel_plane->plane + 1; u32 plane_ctl; I915_WRITE(PLANE_KEYVAL(pipe, plane), key->min_value); @@ -336,7 +336,7 @@ skl_get_colorkey(struct drm_plane *drm_plane, struct drm_i915_private *dev_priv = dev->dev_private; struct intel_plane *intel_plane = to_intel_plane(drm_plane); const int pipe = intel_plane->pipe; - const int plane = intel_plane->plane; + const int plane = intel_plane->plane + 1; u32 plane_ctl; key->min_value = I915_READ(PLANE_KEYVAL(pipe, plane)); -- 1.8.3.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
