drm/i915/skl: Add 180 degree HW rotation support

Add support for 180 degree rotation for primary and sprite planes

Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index a56d9a7e7e0e390876302820468b6ad0381d5a16..6db369a91ee91936505cf6aa03b5d4b272174772 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4579,6 +4579,9 @@ enum punit_power_well {
 #define   PLANE_CTL_ALPHA_DISABLE              (  0 << 4)
 #define   PLANE_CTL_ALPHA_SW_PREMULTIPLY       (  2 << 4)
 #define   PLANE_CTL_ALPHA_HW_PREMULTIPLY       (  3 << 4)
+#define   PLANE_CTL_ROTATE_MASK                        0x3
+#define   PLANE_CTL_ROTATE_0                   0x0
+#define   PLANE_CTL_ROTATE_180                 0x2
 #define _PLANE_STRIDE_1_A                      0x70188
 #define _PLANE_STRIDE_2_A                      0x70288
 #define _PLANE_STRIDE_3_A                      0x70388

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d6fc469d60a6d3375f020d2282ee955eea0605c6..6e6f1505592af1ec11a6ae560a362b29cc5c27db 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2694,6 +2694,8 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,
        }
 
        plane_ctl |= PLANE_CTL_PLANE_GAMMA_DISABLE;
+       if (to_intel_plane(crtc->primary)->rotation == BIT(DRM_ROTATE_180))
+               plane_ctl |= PLANE_CTL_ROTATE_180;
 
        I915_WRITE(PLANE_CTL(pipe, 0), plane_ctl);
 

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 750b634d45eced1387e7a9a8b950bb7f5fe881ed..2c060addea2975ff47636772307ce68778f66c1f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -162,6 +162,7 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,
        plane_ctl &= ~PLANE_CTL_YUV422_ORDER_MASK;
        plane_ctl &= ~PLANE_CTL_TILED_MASK;
        plane_ctl &= ~PLANE_CTL_ALPHA_MASK;
+       plane_ctl &= ~PLANE_CTL_ROTATE_MASK;
 
        /* Trickle feed has to be enabled */
        plane_ctl &= ~PLANE_CTL_TRICKLE_FEED_DISABLE;
@@ -217,6 +218,8 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,
        default:
                BUG();
        }
+       if (intel_plane->rotation == BIT(DRM_ROTATE_180))
+               plane_ctl |= PLANE_CTL_ROTATE_180;
 
        plane_ctl |= PLANE_CTL_ENABLE;
        plane_ctl |= PLANE_CTL_PIPE_CSC_ENABLE;