[Intel-gfx] [PATCH 3/7] drm/i915: Clarify sprite plane function names

[Bob Paauwe]

On Thu, 13 Nov 2014 10:43:22 -0800
Matt Roper <matthew.d.roper at intel.com> wrote:

> A few of the sprite-related function names in i915 are very similar
> (intel_plane_disable() vs intel_disable_plane() or
> intel_enable_planes() vs intel_crtc_enable_planes()) and don't make it
> clear whether they only operate on sprite planes, or whether they also
> apply to all universal plane types.  Rename a few functions to be more
> consistent with our function naming for primary/cursor planes or to
> clarify that they apply specifically to sprite planes:
> 
>  - s/intel_disable_plane/intel_sprite_plane_disable/
>  - s/intel_disable_planes/intel_disable_sprite_planes/
>  - s/intel_enable_planes/intel_enable_sprite_planes/
> 
> Also, drop the sprite-specific intel_destroy_plane() and just use
> the type-agnostic intel_plane_destroy() function.  The extra 'disable'
> call that intel_destroy_plane() did is unnecessary since the plane will
> already be disabled due to framebuffer destruction by the point it gets
> called.
> 
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>

Reviewed-by: Bob Paauwe <bob.j.paauwe at intel.com>

> ---
>  drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
>  drivers/gpu/drm/i915/intel_drv.h     |  3 ++-
>  drivers/gpu/drm/i915/intel_sprite.c  | 14 +++-----------
>  3 files changed, 11 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index c6598e9..52ca8c4 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4024,7 +4024,7 @@ static void ironlake_pfit_enable(struct intel_crtc *crtc)
>  	}
>  }
>  
> -static void intel_enable_planes(struct drm_crtc *crtc)
> +static void intel_enable_sprite_planes(struct drm_crtc *crtc)
>  {
>  	struct drm_device *dev = crtc->dev;
>  	enum pipe pipe = to_intel_crtc(crtc)->pipe;
> @@ -4038,7 +4038,7 @@ static void intel_enable_planes(struct drm_crtc *crtc)
>  	}
>  }
>  
> -static void intel_disable_planes(struct drm_crtc *crtc)
> +static void intel_disable_sprite_planes(struct drm_crtc *crtc)
>  {
>  	struct drm_device *dev = crtc->dev;
>  	enum pipe pipe = to_intel_crtc(crtc)->pipe;
> @@ -4182,7 +4182,7 @@ static void intel_crtc_enable_planes(struct drm_crtc *crtc)
>  	int pipe = intel_crtc->pipe;
>  
>  	intel_enable_primary_hw_plane(crtc->primary, crtc);
> -	intel_enable_planes(crtc);
> +	intel_enable_sprite_planes(crtc);
>  	intel_crtc_update_cursor(crtc, true);
>  	intel_crtc_dpms_overlay(intel_crtc, true);
>  
> @@ -4217,7 +4217,7 @@ static void intel_crtc_disable_planes(struct drm_crtc *crtc)
>  
>  	intel_crtc_dpms_overlay(intel_crtc, false);
>  	intel_crtc_update_cursor(crtc, false);
> -	intel_disable_planes(crtc);
> +	intel_disable_sprite_planes(crtc);
>  	intel_disable_primary_hw_plane(crtc->primary, crtc);
>  
>  	/*
> @@ -11744,7 +11744,7 @@ intel_primary_plane_setplane(struct drm_plane *plane, struct drm_crtc *crtc,
>  }
>  
>  /* Common destruction function for both primary and cursor planes */
> -static void intel_plane_destroy(struct drm_plane *plane)
> +void intel_plane_destroy(struct drm_plane *plane)
>  {
>  	struct intel_plane *intel_plane = to_intel_plane(plane);
>  	drm_plane_cleanup(plane);
> @@ -13693,7 +13693,7 @@ void intel_plane_disable(struct drm_plane *plane)
>  		intel_cursor_plane_disable(plane);
>  		break;
>  	case DRM_PLANE_TYPE_OVERLAY:
> -		intel_disable_plane(plane);
> +		intel_sprite_plane_disable(plane);
>  		break;
>  	default:
>  		WARN(1, "Unknown plane type");
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index df1420b..4913b3f 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1181,6 +1181,7 @@ int intel_plane_set_property(struct drm_plane *plane,
>  			     struct drm_property *prop,
>  			     uint64_t val);
>  int intel_plane_restore(struct drm_plane *plane);
> +void intel_plane_destroy(struct drm_plane *plane);
>  int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
>  			      struct drm_file *file_priv);
>  int intel_sprite_get_colorkey(struct drm_device *dev, void *data,
> @@ -1188,7 +1189,7 @@ int intel_sprite_get_colorkey(struct drm_device *dev, void *data,
>  bool intel_pipe_update_start(struct intel_crtc *crtc,
>  			     uint32_t *start_vbl_count);
>  void intel_pipe_update_end(struct intel_crtc *crtc, u32 start_vbl_count);
> -int intel_disable_plane(struct drm_plane *plane);
> +int intel_sprite_plane_disable(struct drm_plane *plane);
>  
>  /* intel_tv.c */
>  void intel_tv_init(struct drm_device *dev);
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 115acd3..9e6a72a 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1426,7 +1426,7 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
>  }
>  
>  int
> -intel_disable_plane(struct drm_plane *plane)
> +intel_sprite_plane_disable(struct drm_plane *plane)
>  {
>  	struct drm_device *dev = plane->dev;
>  	struct intel_plane *intel_plane = to_intel_plane(plane);
> @@ -1469,14 +1469,6 @@ intel_disable_plane(struct drm_plane *plane)
>  	return 0;
>  }
>  
> -static void intel_destroy_plane(struct drm_plane *plane)
> -{
> -	struct intel_plane *intel_plane = to_intel_plane(plane);
> -	intel_disable_plane(plane);
> -	drm_plane_cleanup(plane);
> -	kfree(intel_plane);
> -}
> -
>  int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
>  			      struct drm_file *file_priv)
>  {
> @@ -1578,8 +1570,8 @@ int intel_plane_restore(struct drm_plane *plane)
>  
>  static const struct drm_plane_funcs intel_plane_funcs = {
>  	.update_plane = intel_update_plane,
> -	.disable_plane = intel_disable_plane,
> -	.destroy = intel_destroy_plane,
> +	.disable_plane = intel_sprite_plane_disable,
> +	.destroy = intel_plane_destroy,
>  	.set_property = intel_plane_set_property,
>  };
>