Commit 7910d693 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/client: Remove holds_console_lock parameter from suspend/resume 



No caller of the client resume/suspend helpers holds the console
lock. The last such cases were removed from radeon in the patch
series at [1]. Now remove the related parameter and the TODO items.

v2:
- update placeholders for CONFIG_DRM_CLIENT=n

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/series/151624/

 # [1]
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarPetr Vorel <pvorel@suse.cz>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Acked-by: default avatarDanilo Krummrich <dakr@kernel.org>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/20251001143709.419736-1-tzimmermann@suse.de
parent b291e4f1

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+4 −4
Original line number Diff line number Diff line
@@ -5212,7 +5212,7 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients) 
		dev_warn(adev->dev, "smart shift update failed\n");



	if (notify_clients)

		drm_client_dev_suspend(adev_to_drm(adev), false);

		drm_client_dev_suspend(adev_to_drm(adev));



	cancel_delayed_work_sync(&adev->delayed_init_work);
@@ -5346,7 +5346,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool notify_clients) 
	flush_delayed_work(&adev->delayed_init_work);



	if (notify_clients)

		drm_client_dev_resume(adev_to_drm(adev), false);

		drm_client_dev_resume(adev_to_drm(adev));



	amdgpu_ras_resume(adev);
@@ -5951,7 +5951,7 @@ int amdgpu_device_reinit_after_reset(struct amdgpu_reset_context *reset_context) 
				if (r)

					goto out;



				drm_client_dev_resume(adev_to_drm(tmp_adev), false);

				drm_client_dev_resume(adev_to_drm(tmp_adev));



				/*

				 * The GPU enters bad state once faulty pages
@@ -6286,7 +6286,7 @@ static void amdgpu_device_halt_activities(struct amdgpu_device *adev, 
		 */

		amdgpu_unregister_gpu_instance(tmp_adev);



		drm_client_dev_suspend(adev_to_drm(tmp_adev), false);

		drm_client_dev_suspend(adev_to_drm(tmp_adev));



		/* disable ras on ALL IPs */

		if (!need_emergency_restart && !amdgpu_reset_in_dpc(adev) &&

drivers/gpu/drm/clients/drm_fbdev_client.c

+4 −10
Original line number Diff line number Diff line
@@ -62,25 +62,19 @@ static int drm_fbdev_client_hotplug(struct drm_client_dev *client) 
	return ret;

}



static int drm_fbdev_client_suspend(struct drm_client_dev *client, bool holds_console_lock)

static int drm_fbdev_client_suspend(struct drm_client_dev *client)

{

	struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);



	if (holds_console_lock)

		drm_fb_helper_set_suspend(fb_helper, true);

	else

	drm_fb_helper_set_suspend_unlocked(fb_helper, true);



	return 0;

}



static int drm_fbdev_client_resume(struct drm_client_dev *client, bool holds_console_lock)

static int drm_fbdev_client_resume(struct drm_client_dev *client)

{

	struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);



	if (holds_console_lock)

		drm_fb_helper_set_suspend(fb_helper, false);

	else

	drm_fb_helper_set_suspend_unlocked(fb_helper, false);



	return 0;

drivers/gpu/drm/clients/drm_log.c

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int drm_log_client_hotplug(struct drm_client_dev *client) 
	return 0;

}



static int drm_log_client_suspend(struct drm_client_dev *client, bool _console_lock)

static int drm_log_client_suspend(struct drm_client_dev *client)

{

	struct drm_log *dlog = client_to_drm_log(client);
@@ -328,7 +328,7 @@ static int drm_log_client_suspend(struct drm_client_dev *client, bool _console_l 
	return 0;

}



static int drm_log_client_resume(struct drm_client_dev *client, bool _console_lock)

static int drm_log_client_resume(struct drm_client_dev *client)

{

	struct drm_log *dlog = client_to_drm_log(client);

drivers/gpu/drm/drm_client_event.c

+8 −8
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void drm_client_dev_restore(struct drm_device *dev) 
	mutex_unlock(&dev->clientlist_mutex);

}



static int drm_client_suspend(struct drm_client_dev *client, bool holds_console_lock)

static int drm_client_suspend(struct drm_client_dev *client)

{

	struct drm_device *dev = client->dev;

	int ret = 0;
@@ -131,7 +131,7 @@ static int drm_client_suspend(struct drm_client_dev *client, bool holds_console_ 
		return 0;



	if (client->funcs && client->funcs->suspend)

		ret = client->funcs->suspend(client, holds_console_lock);

		ret = client->funcs->suspend(client);

	drm_dbg_kms(dev, "%s: ret=%d\n", client->name, ret);



	client->suspended = true;
@@ -139,20 +139,20 @@ static int drm_client_suspend(struct drm_client_dev *client, bool holds_console_ 
	return ret;

}



void drm_client_dev_suspend(struct drm_device *dev, bool holds_console_lock)

void drm_client_dev_suspend(struct drm_device *dev)

{

	struct drm_client_dev *client;



	mutex_lock(&dev->clientlist_mutex);

	list_for_each_entry(client, &dev->clientlist, list) {

		if (!client->suspended)

			drm_client_suspend(client, holds_console_lock);

			drm_client_suspend(client);

	}

	mutex_unlock(&dev->clientlist_mutex);

}

EXPORT_SYMBOL(drm_client_dev_suspend);



static int drm_client_resume(struct drm_client_dev *client, bool holds_console_lock)

static int drm_client_resume(struct drm_client_dev *client)

{

	struct drm_device *dev = client->dev;

	int ret = 0;
@@ -161,7 +161,7 @@ static int drm_client_resume(struct drm_client_dev *client, bool holds_console_l 
		return 0;



	if (client->funcs && client->funcs->resume)

		ret = client->funcs->resume(client, holds_console_lock);

		ret = client->funcs->resume(client);

	drm_dbg_kms(dev, "%s: ret=%d\n", client->name, ret);



	client->suspended = false;
@@ -172,14 +172,14 @@ static int drm_client_resume(struct drm_client_dev *client, bool holds_console_l 
	return ret;

}



void drm_client_dev_resume(struct drm_device *dev, bool holds_console_lock)

void drm_client_dev_resume(struct drm_device *dev)

{

	struct drm_client_dev *client;



	mutex_lock(&dev->clientlist_mutex);

	list_for_each_entry(client, &dev->clientlist, list) {

		if  (client->suspended)

			drm_client_resume(client, holds_console_lock);

			drm_client_resume(client);

	}

	mutex_unlock(&dev->clientlist_mutex);

}

drivers/gpu/drm/drm_modeset_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -203,10 +203,10 @@ int drm_mode_config_helper_suspend(struct drm_device *dev) 
	if (dev->mode_config.poll_enabled)

		drm_kms_helper_poll_disable(dev);



	drm_client_dev_suspend(dev, false);

	drm_client_dev_suspend(dev);

	state = drm_atomic_helper_suspend(dev);

	if (IS_ERR(state)) {

		drm_client_dev_resume(dev, false);

		drm_client_dev_resume(dev);



		/*

		 * Don't enable polling if it was never initialized
@@ -252,7 +252,7 @@ int drm_mode_config_helper_resume(struct drm_device *dev) 
		DRM_ERROR("Failed to resume (%d)\n", ret);

	dev->mode_config.suspend_state = NULL;



	drm_client_dev_resume(dev, false);

	drm_client_dev_resume(dev);



	/*

	 * Don't enable polling if it is not initialized