drm/amdgpu: handle enforce isolation on non-0 gfxhub

alexdeucher · alexdeucher · commit f49280ffd254 · 2024-08-16T14:27:28.000-04:00
Some chips have more than one gfxhub so check if we
are a gfxhub rather than just gfxhub 0.

Acked-by: Srinivasan Shanmugam &lt;srinivasan.shanmugam@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c
@@ -484,7 +484,7 @@ int amdgpu_vmid_grab(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
 bool amdgpu_vmid_uses_reserved(struct amdgpu_vm *vm, unsigned int vmhub)
 {
 	return vm->reserved_vmid[vmhub] ||
-		(enforce_isolation && (vmhub == AMDGPU_GFXHUB(0)));
+		(enforce_isolation && AMDGPU_IS_GFXHUB(vmhub));
 }
 
 int amdgpu_vmid_alloc_reserved(struct amdgpu_device *adev,

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ int amdgpu_vmid_grab(struct amdgpu_vm vm, struct amdgpu_ring ring,`
`484`	`484`	`bool amdgpu_vmid_uses_reserved(struct amdgpu_vm *vm, unsigned int vmhub)`
`485`	`485`	`{`
`486`	`486`	`return vm->reserved_vmid[vmhub] \|\|`
`487`		`- (enforce_isolation && (vmhub == AMDGPU_GFXHUB(0)));`
	`487`	`+ (enforce_isolation && AMDGPU_IS_GFXHUB(vmhub));`
`488`	`488`	`}`
`489`	`489`
`490`	`490`	`int amdgpu_vmid_alloc_reserved(struct amdgpu_device *adev,`