Commit ca9cab18 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: add immutable zpos plane properties 



This adds basic immutable support for the zpos property. The zpos increases
from bottom to top: primary, sprites, cursor.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
[contact@emersion.fr: adapted for latest drm-tip]
Signed-off-by: default avatarSimon Ser <contact@emersion.fr>
Link: https://patchwork.freedesktop.org/patch/msgid/YSH9PasoADJJdNJCSdI4m55ankIBsCaoSgkw-NQ5dlruCAxc8J-SQwVl5n3ddSAMDLTdbdyQvkONmtbjkUU-TQk5VIu1p-aZRO1OjjuSxjY=@emersion.fr


Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent a8c15954

drivers/gpu/drm/i915/display/intel_display.c

+8 −2
Original line number Diff line number Diff line
@@ -14887,7 +14887,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
	const u64 *modifiers;

	const u32 *formats;

	int num_formats;

	int ret;

	int ret, zpos;



	if (INTEL_GEN(dev_priv) >= 9)

		return skl_universal_plane_create(dev_priv, pipe,
@@ -14976,6 +14976,9 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) 
						   DRM_MODE_ROTATE_0,

						   supported_rotations);



	zpos = 0;

	drm_plane_create_zpos_immutable_property(&plane->base, zpos);



	drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);



	return plane;
@@ -14992,7 +14995,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, 
{

	unsigned int possible_crtcs;

	struct intel_plane *cursor;

	int ret;

	int ret, zpos;



	cursor = intel_plane_alloc();

	if (IS_ERR(cursor))
@@ -15041,6 +15044,9 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, 
						   DRM_MODE_ROTATE_0 |

						   DRM_MODE_ROTATE_180);



	zpos = RUNTIME_INFO(dev_priv)->num_sprites[pipe] + 1;

	drm_plane_create_zpos_immutable_property(&cursor->base, zpos);



	drm_plane_helper_add(&cursor->base, &intel_plane_helper_funcs);



	return cursor;

drivers/gpu/drm/i915/display/intel_sprite.c

+6 −1
Original line number Diff line number Diff line
@@ -2592,6 +2592,8 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, 
					     BIT(DRM_MODE_BLEND_PREMULTI) |

					     BIT(DRM_MODE_BLEND_COVERAGE));



	drm_plane_create_zpos_immutable_property(&plane->base, plane_id);



	drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);



	return plane;
@@ -2613,7 +2615,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 
	const u64 *modifiers;

	const u32 *formats;

	int num_formats;

	int ret;

	int ret, zpos;



	if (INTEL_GEN(dev_priv) >= 9)

		return skl_universal_plane_create(dev_priv, pipe,
@@ -2703,6 +2705,9 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, 
					  DRM_COLOR_YCBCR_BT709,

					  DRM_COLOR_YCBCR_LIMITED_RANGE);



	zpos = sprite + 1;

	drm_plane_create_zpos_immutable_property(&plane->base, zpos);



	drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs);



	return plane;

CRA Git | Maintained and supported by SUSTech CRA and CCSE