Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f1a7ab2 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Jani Nikula
Browse files

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: 8d0deca8 ("drm/i915: Pass 90/270 vs. 0/180 rotation info for intel_gen4_compute_page_offset()")
Signed-off-by: default avatarVille 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: default avatarChris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 11df4d95)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 48004881

drivers/gpu/drm/i915/intel_sprite.c

+1 −1
Original line number Diff line number Diff line
@@ -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;