Commit d56aabaa authored by Timur Kristóf's avatar Timur Kristóf Committed by Alex Deucher
Browse files

drm/amdgpu/gmc6: Don't print MC client as it's unknown 



The VM_CONTEXT1_PROTECTION_FAULT_MCCLIENT register
doesn't exist on GMC v6 so we can't print the MC client as a
string like we do on GMC v7-v8. However, we still print the
mc_id from VM_CONTEXT1_PROTECTION_FAULT_STATUS.

Signed-off-by: default avatarTimur Kristóf <timur.kristof@gmail.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 488d9e7c

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

+4 −6
Original line number Diff line number Diff line
@@ -610,23 +610,21 @@ static void gmc_v6_0_gart_disable(struct amdgpu_device *adev) 
}



static void gmc_v6_0_vm_decode_fault(struct amdgpu_device *adev,

				     u32 status, u32 addr, u32 mc_client)

				     u32 status, u32 addr)

{

	u32 mc_id;

	u32 vmid = REG_GET_FIELD(status, VM_CONTEXT1_PROTECTION_FAULT_STATUS, VMID);

	u32 protections = REG_GET_FIELD(status, VM_CONTEXT1_PROTECTION_FAULT_STATUS,

					PROTECTIONS);

	char block[5] = { mc_client >> 24, (mc_client >> 16) & 0xff,

		(mc_client >> 8) & 0xff, mc_client & 0xff, 0 };



	mc_id = REG_GET_FIELD(status, VM_CONTEXT1_PROTECTION_FAULT_STATUS,

			      MEMORY_CLIENT_ID);



	dev_err(adev->dev, "VM fault (0x%02x, vmid %d) at page %u, %s from '%s' (0x%08x) (%d)\n",

	dev_err(adev->dev, "VM fault (0x%02x, vmid %d) at page %u, %s from %d\n",

	       protections, vmid, addr,

	       REG_GET_FIELD(status, VM_CONTEXT1_PROTECTION_FAULT_STATUS,

			     MEMORY_CLIENT_RW) ?

	       "write" : "read", block, mc_client, mc_id);

	       "write" : "read", mc_id);

}



static const u32 mc_cg_registers[] = {
@@ -1089,7 +1087,7 @@ static int gmc_v6_0_process_interrupt(struct amdgpu_device *adev, 
			addr);

		dev_err(adev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",

			status);

		gmc_v6_0_vm_decode_fault(adev, status, addr, 0);

		gmc_v6_0_vm_decode_fault(adev, status, addr);

	}



	return 0;