[Intel-gfx] [PATCH 3/3] drm: Drop crtc argument from __drm_atomic_helper_connector_destroy_state

[Laurent Pinchart]

Hi Daniel,

Thank you for the patch.

s/crtc/connector/ in the subject (I've just realized that the same comment 
applies to patch 2/3, with s/connector/plane/ as well).

Apart from that,

Acked-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

On Friday 06 May 2016 10:32:30 Daniel Vetter wrote:
> It's unused, and really this helper should only look at the state
> structure and nothing else. Note that this conflicts with a patch from
> Dave that adds refcounting to drm_connectors. It's not yet clear
> whether the check Dave adds for connector != NULL is really needed or
> the right check.
> 
> Cc: Dave Airlie <airlied at gmail.com>
> Acked-by: Thierry Reding <thierry.reding at gmail.com>
> Acked-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  drivers/gpu/drm/drm_atomic_helper.c | 9 +++------
>  include/drm/drm_atomic_helper.h     | 3 +--
>  2 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c
> b/drivers/gpu/drm/drm_atomic_helper.c index eb79073c0086..70a50f746863
> 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -2737,8 +2737,7 @@ void drm_atomic_helper_connector_reset(struct
> drm_connector *connector) kzalloc(sizeof(*conn_state), GFP_KERNEL);
> 
>  	if (connector->state)
> -		__drm_atomic_helper_connector_destroy_state(connector,
> -							    connector->state);
> +		__drm_atomic_helper_connector_destroy_state(connector->state);
> 
>  	kfree(connector->state);
>  	__drm_atomic_helper_connector_reset(connector, conn_state);
> @@ -2871,7 +2870,6 @@ EXPORT_SYMBOL(drm_atomic_helper_duplicate_state);
> 
>  /**
>   * __drm_atomic_helper_connector_destroy_state - release connector state
> - * @connector: connector object
>   * @state: connector state object to release
>   *
>   * Releases all resources stored in the connector state without actually
> @@ -2879,8 +2877,7 @@ EXPORT_SYMBOL(drm_atomic_helper_duplicate_state);
>   * subclass the connector state.
>   */
>  void
> -__drm_atomic_helper_connector_destroy_state(struct drm_connector
> *connector, -					    struct drm_connector_state *state)
> +__drm_atomic_helper_connector_destroy_state(struct drm_connector_state
> *state) {
>  	/*
>  	 * This is currently a placeholder so that drivers that subclass the
> @@ -2903,7 +2900,7 @@
> EXPORT_SYMBOL(__drm_atomic_helper_connector_destroy_state); void
> drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
> struct drm_connector_state *state)
>  {
> -	__drm_atomic_helper_connector_destroy_state(connector, state);
> +	__drm_atomic_helper_connector_destroy_state(state);
>  	kfree(state);
>  }
>  EXPORT_SYMBOL(drm_atomic_helper_connector_destroy_state);
> diff --git a/include/drm/drm_atomic_helper.h
> b/include/drm/drm_atomic_helper.h index e9d661a8bd92..3db202e8f270 100644
> --- a/include/drm/drm_atomic_helper.h
> +++ b/include/drm/drm_atomic_helper.h
> @@ -142,8 +142,7 @@ struct drm_atomic_state *
>  drm_atomic_helper_duplicate_state(struct drm_device *dev,
>  				  struct drm_modeset_acquire_ctx *ctx);
>  void
> -__drm_atomic_helper_connector_destroy_state(struct drm_connector
> *connector, -					    struct drm_connector_state *state);
> +__drm_atomic_helper_connector_destroy_state(struct drm_connector_state
> *state); void drm_atomic_helper_connector_destroy_state(struct
> drm_connector *connector, struct drm_connector_state *state);
>  void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,

-- 
Regards,

Laurent Pinchart