drm/i915: Grab the rotation from the passed plane state for VLV sprites
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 7 Nov 2016 20:20:55 +0000 (22:20 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 8 Nov 2016 13:38:25 +0000 (15:38 +0200)
Use the passed in plane_state instead of plane->state in
vlv_update_plane(). Currently the two are one and the same, but if we
start queuing up multiple plane updates they might not be.

Looks like this was rebase fail on my part.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Fixes: 8d0deca8c6e0 ("drm/i915: Pass 90/270 vs. 0/180 rotation info for intel_gen4_compute_page_offset()")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1478550057-24864-4-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_sprite.c

index df0fbb4b15a3a9b67a47bf7c830177bf99791e00..5e4eb7cafef0c78b9f437ab5695bcaed8f7c4523 100644 (file)
@@ -362,7 +362,7 @@ vlv_update_plane(struct drm_plane *dplane,
        int plane = intel_plane->plane;
        u32 sprctl;
        u32 sprsurf_offset, linear_offset;
-       unsigned int rotation = dplane->state->rotation;
+       unsigned int rotation = plane_state->base.rotation;
        const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
        int crtc_x = plane_state->base.dst.x1;
        int crtc_y = plane_state->base.dst.y1;