DRM deadcode
Subsystems (2)
v3 cover DRM deadcode
From: "Dr. David Alan Gilbert" <[email protected]>
This is simply a rebased repost of v2 which was posted in October 2024 and had a Review-by on the last patch by Dmitry, but otherwise hasn't moved.
The only change is of the order of the commit message in the Revert, as commented on by Dmitry.
The original v2 thread is:
https://lore.kernel.org/all/[email protected]/
Dave
Dr. David Alan Gilbert (3):
drm: Remove unused drm_atomic_helper_commit_planes_on_crtc drm/sysfs: Remove unused drm_class_device_(un)register Revert "drm/client: Add drm_client_modeset_check()"
drivers/gpu/drm/drm_atomic_helper.c | 72 ---------------------------- drivers/gpu/drm/drm_client_modeset.c | 35 ++------------ drivers/gpu/drm/drm_sysfs.c | 32 ------------- include/drm/drm_atomic_helper.h | 1 - include/drm/drm_client.h | 1 - include/drm/drm_sysfs.h | 4 -- 6 files changed, 4 insertions(+), 141 deletions(-)
Signature · 1 line
2.49.0
PATCH v3 1/3 drm: Remove unused drm_atomic_helper_commit_planes_on_crtc
From: "Dr. David Alan Gilbert" <[email protected]>
The last use of drm_atomic_helper_commit_planes_on_crtc() was removed in 2018 by
commit 6c246b81f938 ("drm/i915: Replace call to commit_planes_on_crtc with internal update, v2.")
Remove it.
--- drivers/gpu/drm/drm_atomic_helper.c | 72 ----------------------------- include/drm/drm_atomic_helper.h | 1 - 2 files changed, 73 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +0 -72
@@ -2743,8 +2743,6 @@ static bool plane_crtc_active(const struct drm_plane_state *state)* crtcs need to be updated though. * * Note that this function does all plane updates across all CRTCs in one step. -* If the hardware can't support this approach look at -* drm_atomic_helper_commit_planes_on_crtc() instead. * * Plane parameters can be updated by applications while the associated CRTC is * disabled. The DRM/KMS core will store the parameters in the plane state,
@@ -2871,76 +2869,6 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, }EXPORT_SYMBOL (drm_atomic_helper_commit_planes); -/** -* drm_atomic_helper_commit_planes_on_crtc - commit plane state for a CRTC -* @old_crtc_state: atomic state object with the old CRTC state -* -* This function commits the new plane state using the plane and atomic helper -* functions for planes on the specific CRTC. It assumes that the atomic state -* has already been pushed into the relevant object state pointers, since this -* step can no longer fail. -* -* This function is useful when plane updates should be done CRTC-by-CRTC -* instead of one global step like drm_atomic_helper_commit_planes() does. -* -* This function can only be savely used when planes are not allowed to move -* between different CRTCs because this function doesn't handle inter-CRTC -* dependencies. Callers need to ensure that either no such dependencies exist, -* resolve them through ordering of commit calls or through some other means. -*/ -void -drm_atomic_helper_commit_planes_on_crtc (struct drm_crtc_state *old_crtc_state) -{ -const struct drm_crtc_helper_funcs *crtc_funcs; -struct drm_crtc *crtc = old_crtc_state->crtc; -struct drm_atomic_state *old_state = old_crtc_state->state; -struct drm_crtc_state *new_crtc_state = -drm_atomic_get_new_crtc_state (old_state, crtc); -struct drm_plane *plane; -unsigned int plane_mask; - - plane_mask = old_crtc_state->plane_mask; - plane_mask |= new_crtc_state->plane_mask; - - crtc_funcs = crtc->helper_private; -if (crtc_funcs && crtc_funcs->atomic_begin) - crtc_funcs->atomic_begin (crtc, old_state); - -drm_for_each_plane_mask (plane, crtc->dev, plane_mask) { -struct drm_plane_state *old_plane_state = -drm_atomic_get_old_plane_state (old_state, plane); -struct drm_plane_state *new_plane_state = -drm_atomic_get_new_plane_state (old_state, plane); -const struct drm_plane_helper_funcs *plane_funcs; -bool disabling; - - plane_funcs = plane->helper_private; - -if (!old_plane_state || !plane_funcs) -continue ; - -WARN_ON (new_plane_state->crtc && - new_plane_state->crtc != crtc); - - disabling =drm_atomic_plane_disabling (old_plane_state, new_plane_state); - -if (disabling && plane_funcs->atomic_disable) { - plane_funcs->atomic_disable (plane, old_state); - }else if (new_plane_state->crtc || disabling) { - plane_funcs->atomic_update (plane, old_state); - -if (!disabling && plane_funcs->atomic_enable) { -if (drm_atomic_plane_enabling (old_plane_state, new_plane_state)) - plane_funcs->atomic_enable (plane, old_state); - } - } - } - -if (crtc_funcs && crtc_funcs->atomic_flush) - crtc_funcs->atomic_flush (crtc, old_state); -} -EXPORT_SYMBOL (drm_atomic_helper_commit_planes_on_crtc); -/** * drm_atomic_helper_disable_planes_on_crtc - helper to disable CRTC's planes * @old_crtc_state: atomic state object with the old CRTC state
include/drm/drm_atomic_helper.h +0 -1
@@ -107,7 +107,6 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, uint32_t flags);void drm_atomic_helper_cleanup_planes (struct drm_device *dev,struct drm_atomic_state *old_state); -void drm_atomic_helper_commit_planes_on_crtc (struct drm_crtc_state *old_crtc_state);void drm_atomic_helper_disable_planes_on_crtc (struct drm_crtc_state *old_crtc_state,bool atomic);
Signature · 1 line
2.49.0
PATCH v3 2/3 drm/sysfs: Remove unused drm_class_device_(un)register
In reply to [email protected]From: "Dr. David Alan Gilbert" <[email protected]>
drm_class_device_register() and drm_class_device_unregister() have been unused since
commit ed89fff97382 ("drm/ttm: drop sysfs directory")
Remove them.
--- drivers/gpu/drm/drm_sysfs.c | 32 -------------------------------- include/drm/drm_sysfs.h | 4 ---- 2 files changed, 36 deletions(-)
drivers/gpu/drm/drm_sysfs.c +0 -32
@@ -548,35 +548,3 @@ struct device *drm_sysfs_minor_alloc(struct drm_minor *minor)put_device (kdev);return ERR_PTR (r); } - -/** -* drm_class_device_register - register new device with the DRM sysfs class -* @dev: device to register -* -* Registers a new &struct device within the DRM sysfs class. Essentially only -* used by ttm to have a place for its global settings. Drivers should never use -* this. -*/ -int drm_class_device_register (struct device *dev) -{ -if (!drm_class ||IS_ERR (drm_class)) -return -ENOENT ; - - dev->class = drm_class; -return device_register (dev); -} -EXPORT_SYMBOL_GPL (drm_class_device_register); - -/** -* drm_class_device_unregister - unregister device with the DRM sysfs class -* @dev: device to unregister -* -* Unregisters a &struct device from the DRM sysfs class. Essentially only used -* by ttm to have a place for its global settings. Drivers should never use -* this. -*/ -void drm_class_device_unregister (struct device *dev) -{ -return device_unregister (dev); -} -EXPORT_SYMBOL_GPL (drm_class_device_unregister);
include/drm/drm_sysfs.h +0 -4
@@ -3,13 +3,9 @@#define _DRM_SYSFS_H_struct drm_device ; -struct device ;struct drm_connector ;struct drm_property ; -int drm_class_device_register (struct device *dev); -void drm_class_device_unregister (struct device *dev); -void drm_sysfs_hotplug_event (struct drm_device *dev);void drm_sysfs_connector_hotplug_event (struct drm_connector *connector); void drm_sysfs_connector_property_event(struct drm_connector *connector,
Signature · 1 line
2.49.0
PATCH v3 3/3 Revert "drm/client: Add drm_client_modeset_check()"
In reply to [email protected]From: "Dr. David Alan Gilbert" <[email protected]>
This reverts commit 64593f2a6fc933bb9a410bc3f8c261f3e57a9601.
drm_client_modeset_check() was explicitly added in 2020 by commit 64593f2a6fc9 ("drm/client: Add drm_client_modeset_check()") but has never been used.
--- drivers/gpu/drm/drm_client_modeset.c | 35 ++++------------------------ include/drm/drm_client.h | 1 - 2 files changed, 4 insertions(+), 32 deletions(-)
drivers/gpu/drm/drm_client_modeset.c +4 -31
@@ -1028,7 +1028,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;
@@ -1095,10 +1095,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 )
@@ -1159,30 +1156,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
@@ -1201,7 +1174,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);
@@ -1280,7 +1253,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);
include/drm/drm_client.h +0 -1
@@ -216,7 +216,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);
Signature · 1 line
2.49.0