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ä <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Signed-off-by: Sonika Jindal <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4a34709794f0f26daf52617da679ce3da77cdd87..c97b4963e5c13b814cd4b26c1f1f7b0ae3add742 100644 (file)
--- 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);
        }