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

Commit 5273db70 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/si: add missing radeon_bo_unreserve in si_rlc_init() v2 



Forget to unreserve after pinning.  This can lead to problems in
soft reset and resume.

v2: rework patch as per Michel's suggestion.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 16a5e32b

drivers/gpu/drm/radeon/si.c

+2 −3
Original line number Diff line number Diff line
@@ -2999,8 +2999,8 @@ int si_rlc_init(struct radeon_device *rdev) 
	}

	r = radeon_bo_pin(rdev->rlc.save_restore_obj, RADEON_GEM_DOMAIN_VRAM,

			  &rdev->rlc.save_restore_gpu_addr);

	if (r) {

	radeon_bo_unreserve(rdev->rlc.save_restore_obj);

	if (r) {

		dev_warn(rdev->dev, "(%d) pin RLC sr bo failed\n", r);

		si_rlc_fini(rdev);

		return r;
@@ -3023,9 +3023,8 @@ int si_rlc_init(struct radeon_device *rdev) 
	}

	r = radeon_bo_pin(rdev->rlc.clear_state_obj, RADEON_GEM_DOMAIN_VRAM,

			  &rdev->rlc.clear_state_gpu_addr);

	if (r) {



	radeon_bo_unreserve(rdev->rlc.clear_state_obj);

	if (r) {

		dev_warn(rdev->dev, "(%d) pin RLC c bo failed\n", r);

		si_rlc_fini(rdev);

		return r;