diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-11-07 22:20:55 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-11-11 10:04:41 +0200 |
| commit | 9f1a7ab260300c670608a9db861187069f8b179a (patch) | |
| tree | 5e2a0955e766953986ac150c2ce667803e72965f /drivers/gpu | |
| parent | 48004881f6935704e5e4ffaf9e0ec921a25db243 (diff) | |
| download | op-kernel-dev-9f1a7ab260300c670608a9db861187069f8b179a.zip op-kernel-dev-9f1a7ab260300c670608a9db861187069f8b179a.tar.gz | |
drm/i915: Grab the rotation from the passed plane state for VLV sprites
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>
(cherry picked from commit 11df4d95b3ad9e6a6a6e0907bb200610a4d24887)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 73a521f..dbed12c 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -358,7 +358,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; |
