Commit 4cf50bae authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/amdgpu: Suspend and resume internal clients with client helpers 



Replace calls to drm_fb_helper_set_suspend_unlocked() with calls
to the client functions drm_client_dev_suspend() and
drm_client_dev_resume(). Any registered in-kernel client will now
receive suspend and resume events.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Xinhui Pan <Xinhui.Pan@amd.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241014085740.582287-9-tzimmermann@suse.de
parent bf17766f

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

+11 −11
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ 
#include <linux/apple-gmux.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_client_event.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_probe_helper.h>

#include <drm/amdgpu_drm.h>

#include <linux/device.h>
@@ -4712,13 +4712,13 @@ int amdgpu_device_prepare(struct drm_device *dev) 
 * amdgpu_device_suspend - initiate device suspend

 *

 * @dev: drm dev pointer

 * @fbcon : notify the fbdev of suspend

 * @notify_clients: notify in-kernel DRM clients

 *

 * Puts the hw in the suspend state (all asics).

 * Returns 0 for success or an error on failure.

 * Called at driver suspend.

 */

int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)

int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients)

{

	struct amdgpu_device *adev = drm_to_adev(dev);

	int r = 0;
@@ -4738,8 +4738,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 
	if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D3))

		DRM_WARN("smart shift update failed\n");



	if (fbcon)

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, true);

	if (notify_clients)

		drm_client_dev_suspend(adev_to_drm(adev), false);



	cancel_delayed_work_sync(&adev->delayed_init_work);
@@ -4774,13 +4774,13 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 
 * amdgpu_device_resume - initiate device resume

 *

 * @dev: drm dev pointer

 * @fbcon : notify the fbdev of resume

 * @notify_clients: notify in-kernel DRM clients

 *

 * Bring the hw back to operating state (all asics).

 * Returns 0 for success or an error on failure.

 * Called at driver resume.

 */

int amdgpu_device_resume(struct drm_device *dev, bool fbcon)

int amdgpu_device_resume(struct drm_device *dev, bool notify_clients)

{

	struct amdgpu_device *adev = drm_to_adev(dev);

	int r = 0;
@@ -4836,8 +4836,8 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	/* Make sure IB tests flushed */

	flush_delayed_work(&adev->delayed_init_work);



	if (fbcon)

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, false);

	if (notify_clients)

		drm_client_dev_resume(adev_to_drm(adev), false);



	amdgpu_ras_resume(adev);
@@ -5449,7 +5449,7 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle, 
				if (r)

					goto out;



				drm_fb_helper_set_suspend_unlocked(adev_to_drm(tmp_adev)->fb_helper, false);

				drm_client_dev_resume(adev_to_drm(tmp_adev), false);



				/*

				 * The GPU enters bad state once faulty pages
@@ -5735,7 +5735,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
		 */

		amdgpu_unregister_gpu_instance(tmp_adev);



		drm_fb_helper_set_suspend_unlocked(adev_to_drm(tmp_adev)->fb_helper, true);

		drm_client_dev_suspend(adev_to_drm(tmp_adev), false);



		/* disable ras on ALL IPs */

		if (!need_emergency_restart &&