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

Commit 5f8e3f57 authored by Joonas Lahtinen's avatar Joonas Lahtinen Committed by Rodrigo Vivi
Browse files

drm/i915/cnl: Add support for horizontal plane flipping 



CNL supports horizontal plane flipping on non-linear plane formats.

v2:
- Avoid BUG unlike elsewhere in the code (Ville)
- Hoist the rotation-tiling restriction check (Ville)

v3 (Rodrigo):
- Rebased after a while.
- Fix small indentation issues.

Bspec: 7656
Suggested-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171215213800.7896-1-rodrigo.vivi@intel.com
parent 8edcda12

drivers/gpu/drm/i915/i915_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -6329,6 +6329,7 @@ enum { 
#define   PLANE_CTL_TILED_X			(  1 << 10)

#define   PLANE_CTL_TILED_Y			(  4 << 10)

#define   PLANE_CTL_TILED_YF			(  5 << 10)

#define   PLANE_CTL_FLIP_HORIZONTAL		(  1 << 8)

#define   PLANE_CTL_ALPHA_MASK			(0x3 << 4) /* Pre-GLK */

#define   PLANE_CTL_ALPHA_DISABLE		(  0 << 4)

#define   PLANE_CTL_ALPHA_SW_PREMULTIPLY	(  2 << 4)

drivers/gpu/drm/i915/intel_display.c

+35 −5
Original line number Diff line number Diff line
@@ -3073,6 +3073,12 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state) 
	unsigned int rotation = plane_state->base.rotation;

	int ret;



	if (rotation & DRM_MODE_REFLECT_X &&

	    fb->modifier == DRM_FORMAT_MOD_LINEAR) {

		DRM_DEBUG_KMS("horizontal flip is not supported with linear surface formats\n");

		return -EINVAL;

	}



	if (!plane_state->base.visible)

		return 0;
@@ -3453,9 +3459,9 @@ static u32 skl_plane_ctl_tiling(uint64_t fb_modifier) 
	return 0;

}



static u32 skl_plane_ctl_rotation(unsigned int rotation)

static u32 skl_plane_ctl_rotate(unsigned int rotate)

{

	switch (rotation) {

	switch (rotate) {

	case DRM_MODE_ROTATE_0:

		break;

	/*
@@ -3469,7 +3475,22 @@ static u32 skl_plane_ctl_rotation(unsigned int rotation) 
	case DRM_MODE_ROTATE_270:

		return PLANE_CTL_ROTATE_90;

	default:

		MISSING_CASE(rotation);

		MISSING_CASE(rotate);

	}



	return 0;

}



static u32 cnl_plane_ctl_flip(unsigned int reflect)

{

	switch (reflect) {

	case 0:

		break;

	case DRM_MODE_REFLECT_X:

		return PLANE_CTL_FLIP_HORIZONTAL;

	case DRM_MODE_REFLECT_Y:

	default:

		MISSING_CASE(reflect);

	}



	return 0;
@@ -3497,7 +3518,11 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state, 


	plane_ctl |= skl_plane_ctl_format(fb->format->format);

	plane_ctl |= skl_plane_ctl_tiling(fb->modifier);

	plane_ctl |= skl_plane_ctl_rotation(rotation);

	plane_ctl |= skl_plane_ctl_rotate(rotation & DRM_MODE_ROTATE_MASK);



	if (INTEL_GEN(dev_priv) >= 10)

		plane_ctl |= cnl_plane_ctl_flip(rotation &

						DRM_MODE_REFLECT_MASK);



	if (key->flags & I915_SET_COLORKEY_DESTINATION)

		plane_ctl |= PLANE_CTL_KEY_ENABLE_DESTINATION;
@@ -13300,7 +13325,12 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
	if (ret)

		goto fail;



	if (INTEL_GEN(dev_priv) >= 9) {

	if (INTEL_GEN(dev_priv) >= 10) {

		supported_rotations =

			DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |

			DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270 |

			DRM_MODE_REFLECT_X;

	} else if (INTEL_GEN(dev_priv) >= 9) {

		supported_rotations =

			DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |

			DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270;