Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecb8c503 authored by Shirish S's avatar Shirish S Committed by Alex Deucher
Browse files

drm/amdgpu: use drm_fb helper for console_(un)lock 



This patch removes the usage of console_(un)lock
by replacing drm_fb_helper_set_suspend() to
drm_fb_helper_set_suspend_unlocked() which locks and
unlocks the console instead of locking ourselves.

Signed-off-by: default avatarShirish S <shirish.s@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3dbd823e

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

+2 −6
Original line number Diff line number Diff line
@@ -2691,11 +2691,9 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon) 
			DRM_ERROR("amdgpu asic reset failed\n");

	}



	if (fbcon) {

		console_lock();

	if (fbcon)

		amdgpu_fbdev_set_suspend(adev, 1);

		console_unlock();

	}



	return 0;

}
@@ -2780,9 +2778,7 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon) 
			}

			drm_modeset_unlock_all(dev);

		}

		console_lock();

		amdgpu_fbdev_set_suspend(adev, 0);

		console_unlock();

	}



	drm_kms_helper_poll_enable(dev);

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

+2 −2
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ void amdgpu_fbdev_fini(struct amdgpu_device *adev) 
void amdgpu_fbdev_set_suspend(struct amdgpu_device *adev, int state)

{

	if (adev->mode_info.rfbdev)

		drm_fb_helper_set_suspend(&adev->mode_info.rfbdev->helper,

		drm_fb_helper_set_suspend_unlocked(&adev->mode_info.rfbdev->helper,

						   state);

}