summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSonika Jindal <sonika.jindal@intel.com>2015-05-20 08:10:48 (GMT)
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-05-20 09:26:12 (GMT)
commit1e8df16778b0d8fd8102b3ee799b028f8f961089 (patch)
tree71fa5d8d4f64f0ca3fdcdd8af3b32a7196be09a8 /drivers
parent7546a38411fc3eb9e0ff1252718b0bf6579c87f6 (diff)
downloadlinux-1e8df16778b0d8fd8102b3ee799b028f8f961089.tar.xz
drm/i915/skl: Swapping 90 and 270 to be compliant with Xrandr
Since DRM_ROTATE is counter clockwise (which is compliant with Xrandr), and HW rotation is clockwise, swapping 90/270 to work as expected from userspace. v2: Rebased Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4a34709..c97b496 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3010,12 +3010,16 @@ u32 skl_plane_ctl_rotation(unsigned int rotation)
switch (rotation) {
case BIT(DRM_ROTATE_0):
break;
+ /*
+ * DRM_ROTATE_ is counter clockwise to stay compatible with Xrandr
+ * while i915 HW rotation is clockwise, thats why this swapping.
+ */
case BIT(DRM_ROTATE_90):
- return PLANE_CTL_ROTATE_90;
+ return PLANE_CTL_ROTATE_270;
case BIT(DRM_ROTATE_180):
return PLANE_CTL_ROTATE_180;
case BIT(DRM_ROTATE_270):
- return PLANE_CTL_ROTATE_270;
+ return PLANE_CTL_ROTATE_90;
default:
MISSING_CASE(rotation);
}