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

Commit 8e078788 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 



- Parially revert a bulk move clean up change to fix a ref count bug
- Fix invalid use of change_bit that caused a crash on PPC64 and ARM64

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190321020933.3508-1-alexander.deucher@amd.com
parents 6a9d8fc0 72464382

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

+2 −0
Original line number Diff line number Diff line
@@ -700,6 +700,8 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	struct amdgpu_vm_bo_base *bo_base, *tmp;

	int r = 0;



	vm->bulk_moveable &= list_empty(&vm->evicted);



	list_for_each_entry_safe(bo_base, tmp, &vm->evicted, vm_status) {

		struct amdgpu_bo *bo = bo_base->bo;

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

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ static int gmc_v9_0_allocate_vm_inv_eng(struct amdgpu_device *adev) 
		}



		ring->vm_inv_eng = inv_eng - 1;

		change_bit(inv_eng - 1, (unsigned long *)(&vm_inv_engs[vmhub]));

		vm_inv_engs[vmhub] &= ~(1 << ring->vm_inv_eng);



		dev_info(adev->dev, "ring %s uses VM inv eng %u on hub %u\n",

			 ring->name, ring->vm_inv_eng, ring->funcs->vmhub);