drm: Remove unused argument from __drm_atomic_helper_disable_all()

Submitted by Sean Paul on Feb. 12, 2019, 4:43 p.m.

Details

Message ID 20190212164405.177259-1-sean@poorly.run
State New
Headers show
Series "drm: Remove unused argument from __drm_atomic_helper_disable_all()" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Sean Paul Feb. 12, 2019, 4:43 p.m.
From: Sean Paul <seanpaul@chromium.org>

Its use was removed in an earlier commit, but it is still hanging
around.

Fixes: e00fb8564ee9 ("drm: Stop updating plane->crtc/fb/old_fb on atomic drivers")
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 drivers/gpu/drm/drm_atomic_helper.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index c53ecbd9abddd..460509ef180a6 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -3031,8 +3031,7 @@  int __drm_atomic_helper_set_config(struct drm_mode_set *set,
 }
 
 static int __drm_atomic_helper_disable_all(struct drm_device *dev,
-					   struct drm_modeset_acquire_ctx *ctx,
-					   bool clean_old_fbs)
+					   struct drm_modeset_acquire_ctx *ctx)
 {
 	struct drm_atomic_state *state;
 	struct drm_connector_state *conn_state;
@@ -3117,7 +3116,7 @@  static int __drm_atomic_helper_disable_all(struct drm_device *dev,
 int drm_atomic_helper_disable_all(struct drm_device *dev,
 				  struct drm_modeset_acquire_ctx *ctx)
 {
-	return __drm_atomic_helper_disable_all(dev, ctx, false);
+	return __drm_atomic_helper_disable_all(dev, ctx);
 }
 EXPORT_SYMBOL(drm_atomic_helper_disable_all);
 
@@ -3139,7 +3138,7 @@  void drm_atomic_helper_shutdown(struct drm_device *dev)
 
 	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 
-	ret = __drm_atomic_helper_disable_all(dev, &ctx, true);
+	ret = __drm_atomic_helper_disable_all(dev, &ctx);
 	if (ret)
 		DRM_ERROR("Disabling all crtc's during unload failed with %i\n", ret);
 

Comments

On Tue, Feb 12, 2019 at 11:43:58AM -0500, Sean Paul wrote:
> From: Sean Paul <seanpaul@chromium.org>
> 
> Its use was removed in an earlier commit, but it is still hanging
> around.
> 
> Fixes: e00fb8564ee9 ("drm: Stop updating plane->crtc/fb/old_fb on atomic drivers")
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Harry Wentland <harry.wentland@amd.com>
> Cc: Sinclair Yeh <syeh@vmware.com>
> Cc: Maxime Ripard <maxime.ripard@bootlin.com>
> Cc: Sean Paul <sean@poorly.run>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: dri-devel@lists.freedesktop.org
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
>  drivers/gpu/drm/drm_atomic_helper.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index c53ecbd9abddd..460509ef180a6 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -3031,8 +3031,7 @@ int __drm_atomic_helper_set_config(struct drm_mode_set *set,
>  }
>  
>  static int __drm_atomic_helper_disable_all(struct drm_device *dev,
> -					   struct drm_modeset_acquire_ctx *ctx,
> -					   bool clean_old_fbs)
> +					   struct drm_modeset_acquire_ctx *ctx)

And I just realized the arguments exactly mirror
drm_atomic_helper_disable_all(), so I'll spin a new patch to remove the '__' and unify the useless wrapper.

Sean

>  {
>  	struct drm_atomic_state *state;
>  	struct drm_connector_state *conn_state;
> @@ -3117,7 +3116,7 @@ static int __drm_atomic_helper_disable_all(struct drm_device *dev,
>  int drm_atomic_helper_disable_all(struct drm_device *dev,
>  				  struct drm_modeset_acquire_ctx *ctx)
>  {
> -	return __drm_atomic_helper_disable_all(dev, ctx, false);
> +	return __drm_atomic_helper_disable_all(dev, ctx);
>  }
>  EXPORT_SYMBOL(drm_atomic_helper_disable_all);
>  
> @@ -3139,7 +3138,7 @@ void drm_atomic_helper_shutdown(struct drm_device *dev)
>  
>  	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
>  
> -	ret = __drm_atomic_helper_disable_all(dev, &ctx, true);
> +	ret = __drm_atomic_helper_disable_all(dev, &ctx);
>  	if (ret)
>  		DRM_ERROR("Disabling all crtc's during unload failed with %i\n", ret);
>  
> -- 
> Sean Paul, Software Engineer, Google / Chromium OS
>