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

Commit 0ea54b9b authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: make the VMID owner always 64bit 



Otherwise we could (in theory) run into problems on 32bit systems.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4d9c514d

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ struct amdgpu_vm_id { 
	struct amdgpu_sync	active;

	struct fence		*last_flush;

	struct amdgpu_ring      *last_user;

	atomic_long_t		owner;

	atomic64_t		owner;



	uint64_t		pd_gpu_addr;

	/* last flushed PD/PT update */

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

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 
		if (!id)

			continue;



		if (atomic_long_read(&id->owner) != vm->client_id)

		if (atomic64_read(&id->owner) != vm->client_id)

			continue;



		if (pd_addr != id->pd_gpu_addr)
@@ -261,7 +261,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 


	list_move_tail(&id->list, &adev->vm_manager.ids_lru);

	id->last_user = ring;

	atomic_long_set(&id->owner, vm->client_id);

	atomic64_set(&id->owner, vm->client_id);

	vm->ids[ring->idx] = id;



	*vm_id = id - adev->vm_manager.ids;