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

Commit 5e386b57 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: fix missing bo reservation 



Otherwise we might get a crash here.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9f050c7f

drivers/gpu/drm/radeon/radeon_kms.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -537,6 +537,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 




		radeon_vm_init(rdev, &fpriv->vm);

		radeon_vm_init(rdev, &fpriv->vm);





		r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);

		if (r)

			return r;



		/* map the ib pool buffer read only into

		/* map the ib pool buffer read only into

		 * virtual address space */

		 * virtual address space */

		bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,

		bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,
@@ -544,6 +548,8 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
		r = radeon_vm_bo_set_addr(rdev, bo_va, RADEON_VA_IB_OFFSET,

		r = radeon_vm_bo_set_addr(rdev, bo_va, RADEON_VA_IB_OFFSET,

					  RADEON_VM_PAGE_READABLE |

					  RADEON_VM_PAGE_READABLE |

					  RADEON_VM_PAGE_SNOOPED);

					  RADEON_VM_PAGE_SNOOPED);



		radeon_bo_unreserve(rdev->ring_tmp_bo.bo);

		if (r) {

		if (r) {

			radeon_vm_fini(rdev, &fpriv->vm);

			radeon_vm_fini(rdev, &fpriv->vm);

			kfree(fpriv);

			kfree(fpriv);