[Intel-gfx] [PATCH v2 11/15] drm/i915: Use the per-plane rotation property

[Joonas Lahtinen]

On pe, 2016-07-22 at 16:43 +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> On certain platforms not all planes support the same set of
> rotations/reflections, so let's use the per-plane property
> for this.
> 
> This is already a problem on SKL when we use the legay cursor plane
> as it only supports 0|180 whereas the universal planes support
> 0|90|180|270, and it will be a problem on CHV soon.
> 
> v2: Use drm_plane_create_rotation_property() helper
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk> (v1)

Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_display.c | 50 +++++++++++++++---------------------
>  drivers/gpu/drm/i915/intel_drv.h     |  3 ---
>  drivers/gpu/drm/i915/intel_sprite.c  | 14 +++++++++-
>  3 files changed, 33 insertions(+), 34 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 51357986cf4a..a6d5c4d434a4 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -14215,6 +14215,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
>  	struct intel_plane *primary = NULL;
>  	struct intel_plane_state *state = NULL;
>  	const uint32_t *intel_primary_formats;
> +	unsigned int supported_rotations;
>  	unsigned int num_formats;
>  	int ret;
>  
> @@ -14287,8 +14288,21 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
>  	if (ret)
>  		goto fail;
>  
> +	if (INTEL_INFO(dev)->gen >= 9) {
> +		supported_rotations =
> +			BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_90) |
> +			BIT(DRM_ROTATE_180) | BIT(DRM_ROTATE_270);
> +	} else if (INTEL_INFO(dev)->gen >= 4) {
> +		supported_rotations =
> +			BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_180);
> +	} else {
> +		supported_rotations = BIT(DRM_ROTATE_0);
> +	}
> +
>  	if (INTEL_INFO(dev)->gen >= 4)
> -		intel_create_rotation_property(dev, primary);
> +		drm_plane_create_rotation_property(&primary->base,
> +						   BIT(DRM_ROTATE_0),
> +						   supported_rotations);
>  
>  	drm_plane_helper_add(&primary->base, &intel_plane_helper_funcs);
>  
> @@ -14301,24 +14315,6 @@ fail:
>  	return NULL;
>  }
>  
> -void intel_create_rotation_property(struct drm_device *dev, struct intel_plane *plane)
> -{
> -	if (!dev->mode_config.rotation_property) {
> -		unsigned long flags = BIT(DRM_ROTATE_0) |
> -			BIT(DRM_ROTATE_180);
> -
> -		if (INTEL_INFO(dev)->gen >= 9)
> -			flags |= BIT(DRM_ROTATE_90) | BIT(DRM_ROTATE_270);
> -
> -		dev->mode_config.rotation_property =
> -			drm_mode_create_rotation_property(dev, flags);
> -	}
> -	if (dev->mode_config.rotation_property)
> -		drm_object_attach_property(&plane->base.base,
> -				dev->mode_config.rotation_property,
> -				plane->base.state->rotation);
> -}
> -
>  static int
>  intel_check_cursor_plane(struct drm_plane *plane,
>  			 struct intel_crtc_state *crtc_state,
> @@ -14447,17 +14443,11 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
>  	if (ret)
>  		goto fail;
>  
> -	if (INTEL_INFO(dev)->gen >= 4) {
> -		if (!dev->mode_config.rotation_property)
> -			dev->mode_config.rotation_property =
> -				drm_mode_create_rotation_property(dev,
> -							BIT(DRM_ROTATE_0) |
> -							BIT(DRM_ROTATE_180));
> -		if (dev->mode_config.rotation_property)
> -			drm_object_attach_property(&cursor->base.base,
> -				dev->mode_config.rotation_property,
> -				state->base.rotation);
> -	}
> +	if (INTEL_INFO(dev)->gen >= 4)
> +		drm_plane_create_rotation_property(&cursor->base,
> +						   BIT(DRM_ROTATE_0),
> +						   BIT(DRM_ROTATE_0) |
> +						   BIT(DRM_ROTATE_180));
>  
>  	if (INTEL_INFO(dev)->gen >=9)
>  		state->scaler_id = -1;
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 907a72cfdad3..9c085a3377a6 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1255,9 +1255,6 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
>  unsigned int intel_tile_height(const struct drm_i915_private *dev_priv,
>  			       uint64_t fb_modifier, unsigned int cpp);
>  
> -void intel_create_rotation_property(struct drm_device *dev,
> -					struct intel_plane *plane);
> -
>  void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv,
>  				    enum pipe pipe);
>  
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index cc6af1410d67..a0395f8f3723 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1046,6 +1046,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
>  	struct intel_plane_state *state = NULL;
>  	unsigned long possible_crtcs;
>  	const uint32_t *plane_formats;
> +	unsigned int supported_rotations;
>  	int num_plane_formats;
>  	int ret;
>  
> @@ -1121,6 +1122,15 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
>  		goto fail;
>  	}
>  
> +	if (INTEL_INFO(dev)->gen >= 9) {
> +		supported_rotations =
> +			BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_90) |
> +			BIT(DRM_ROTATE_180) | BIT(DRM_ROTATE_270);
> +	} else {
> +		supported_rotations =
> +			BIT(DRM_ROTATE_0) | BIT(DRM_ROTATE_180);
> +	}
> +
>  	intel_plane->pipe = pipe;
>  	intel_plane->plane = plane;
>  	intel_plane->frontbuffer_bit = INTEL_FRONTBUFFER_SPRITE(pipe, plane);
> @@ -1143,7 +1153,9 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
>  	if (ret)
>  		goto fail;
>  
> -	intel_create_rotation_property(dev, intel_plane);
> +	drm_plane_create_rotation_property(&intel_plane->base,
> +					   BIT(DRM_ROTATE_0),
> +					   supported_rotations);
>  
>  	drm_plane_helper_add(&intel_plane->base, &intel_plane_helper_funcs);
>  
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation