| Message ID | 20241029234706.285087-4-linux@treblig.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | DRM deadcode | expand |
On Tue, Oct 29, 2024 at 11:47:05PM +0000, linux@treblig.org wrote: > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > drm_client_modeset_check() was explicitly added in 2020 by > commit 64593f2a6fc9 ("drm/client: Add drm_client_modeset_check()") > but has never been used. > > This reverts commit 64593f2a6fc933bb9a410bc3f8c261f3e57a9601. Nit: Usually this comes before the commit message. No need for repost though. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> > --- > drivers/gpu/drm/drm_client_modeset.c | 35 ++++------------------------ > include/drm/drm_client.h | 1 - > 2 files changed, 4 insertions(+), 32 deletions(-) > > diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c > index cee5eafbfb81..39201c11eaac 100644 > --- a/drivers/gpu/drm/drm_client_modeset.c > +++ b/drivers/gpu/drm/drm_client_modeset.c > @@ -995,7 +995,7 @@ bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation) > } > EXPORT_SYMBOL(drm_client_rotation); > > -static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool active, bool check) > +static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool active) > { > struct drm_device *dev = client->dev; > struct drm_plane *plane; > @@ -1062,10 +1062,7 @@ static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool > } > } > > - if (check) > - ret = drm_atomic_check_only(state); > - else > - ret = drm_atomic_commit(state); > + ret = drm_atomic_commit(state); > > out_state: > if (ret == -EDEADLK) > @@ -1126,30 +1123,6 @@ static int drm_client_modeset_commit_legacy(struct drm_client_dev *client) > return ret; > } > > -/** > - * drm_client_modeset_check() - Check modeset configuration > - * @client: DRM client > - * > - * Check modeset configuration. > - * > - * Returns: > - * Zero on success or negative error code on failure. > - */ > -int drm_client_modeset_check(struct drm_client_dev *client) > -{ > - int ret; > - > - if (!drm_drv_uses_atomic_modeset(client->dev)) > - return 0; > - > - mutex_lock(&client->modeset_mutex); > - ret = drm_client_modeset_commit_atomic(client, true, true); > - mutex_unlock(&client->modeset_mutex); > - > - return ret; > -} > -EXPORT_SYMBOL(drm_client_modeset_check); > - > /** > * drm_client_modeset_commit_locked() - Force commit CRTC configuration > * @client: DRM client > @@ -1168,7 +1141,7 @@ int drm_client_modeset_commit_locked(struct drm_client_dev *client) > > mutex_lock(&client->modeset_mutex); > if (drm_drv_uses_atomic_modeset(dev)) > - ret = drm_client_modeset_commit_atomic(client, true, false); > + ret = drm_client_modeset_commit_atomic(client, true); > else > ret = drm_client_modeset_commit_legacy(client); > mutex_unlock(&client->modeset_mutex); > @@ -1246,7 +1219,7 @@ int drm_client_modeset_dpms(struct drm_client_dev *client, int mode) > > mutex_lock(&client->modeset_mutex); > if (drm_drv_uses_atomic_modeset(dev)) > - ret = drm_client_modeset_commit_atomic(client, mode == DRM_MODE_DPMS_ON, false); > + ret = drm_client_modeset_commit_atomic(client, mode == DRM_MODE_DPMS_ON); > else > drm_client_modeset_dpms_legacy(client, mode); > mutex_unlock(&client->modeset_mutex); > diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h > index bc0e66f9c425..ead3c3526ee3 100644 > --- a/include/drm/drm_client.h > +++ b/include/drm/drm_client.h > @@ -177,7 +177,6 @@ int drm_client_modeset_create(struct drm_client_dev *client); > void drm_client_modeset_free(struct drm_client_dev *client); > int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, unsigned int height); > bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation); > -int drm_client_modeset_check(struct drm_client_dev *client); > int drm_client_modeset_commit_locked(struct drm_client_dev *client); > int drm_client_modeset_commit(struct drm_client_dev *client); > int drm_client_modeset_dpms(struct drm_client_dev *client, int mode); > -- > 2.47.0 >
diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c index cee5eafbfb81..39201c11eaac 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -995,7 +995,7 @@ bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation) } EXPORT_SYMBOL(drm_client_rotation); -static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool active, bool check) +static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool active) { struct drm_device *dev = client->dev; struct drm_plane *plane; @@ -1062,10 +1062,7 @@ static int drm_client_modeset_commit_atomic(struct drm_client_dev *client, bool } } - if (check) - ret = drm_atomic_check_only(state); - else - ret = drm_atomic_commit(state); + ret = drm_atomic_commit(state); out_state: if (ret == -EDEADLK) @@ -1126,30 +1123,6 @@ static int drm_client_modeset_commit_legacy(struct drm_client_dev *client) return ret; } -/** - * drm_client_modeset_check() - Check modeset configuration - * @client: DRM client - * - * Check modeset configuration. - * - * Returns: - * Zero on success or negative error code on failure. - */ -int drm_client_modeset_check(struct drm_client_dev *client) -{ - int ret; - - if (!drm_drv_uses_atomic_modeset(client->dev)) - return 0; - - mutex_lock(&client->modeset_mutex); - ret = drm_client_modeset_commit_atomic(client, true, true); - mutex_unlock(&client->modeset_mutex); - - return ret; -} -EXPORT_SYMBOL(drm_client_modeset_check); - /** * drm_client_modeset_commit_locked() - Force commit CRTC configuration * @client: DRM client @@ -1168,7 +1141,7 @@ int drm_client_modeset_commit_locked(struct drm_client_dev *client) mutex_lock(&client->modeset_mutex); if (drm_drv_uses_atomic_modeset(dev)) - ret = drm_client_modeset_commit_atomic(client, true, false); + ret = drm_client_modeset_commit_atomic(client, true); else ret = drm_client_modeset_commit_legacy(client); mutex_unlock(&client->modeset_mutex); @@ -1246,7 +1219,7 @@ int drm_client_modeset_dpms(struct drm_client_dev *client, int mode) mutex_lock(&client->modeset_mutex); if (drm_drv_uses_atomic_modeset(dev)) - ret = drm_client_modeset_commit_atomic(client, mode == DRM_MODE_DPMS_ON, false); + ret = drm_client_modeset_commit_atomic(client, mode == DRM_MODE_DPMS_ON); else drm_client_modeset_dpms_legacy(client, mode); mutex_unlock(&client->modeset_mutex); diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h index bc0e66f9c425..ead3c3526ee3 100644 --- a/include/drm/drm_client.h +++ b/include/drm/drm_client.h @@ -177,7 +177,6 @@ int drm_client_modeset_create(struct drm_client_dev *client); void drm_client_modeset_free(struct drm_client_dev *client); int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, unsigned int height); bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation); -int drm_client_modeset_check(struct drm_client_dev *client); int drm_client_modeset_commit_locked(struct drm_client_dev *client); int drm_client_modeset_commit(struct drm_client_dev *client); int drm_client_modeset_dpms(struct drm_client_dev *client, int mode);