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

Commit fec77bb5 authored by Ben Goz's avatar Ben Goz Committed by Oded Gabbay
Browse files

drm/radeon: Assign VMID to PASID for IH in non-HWS mode 



This patch fixes a bug in kgd_set_pasid_vmid_mapping(), where the function
only updated the ATC registers (IOMMU) with the new VMID <--> PASID mapping,
but didn't update the IH (Interrupt) registers.

The bug only occurs when using non-HWS mode. In HWS mode, the CP automatically
does the VMID <--> PASID mapping.

Signed-off-by: default avatarBen Goz <ben.goz@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4c18442e

drivers/gpu/drm/radeon/cikd.h

+2 −0
Original line number Diff line number Diff line
@@ -2156,4 +2156,6 @@ 
#define ATC_VM_APERTURE1_HIGH_ADDR				0x330Cu

#define ATC_VM_APERTURE1_LOW_ADDR				0x3304u



#define IH_VMID_0_LUT						0x3D40u



#endif

drivers/gpu/drm/radeon/radeon_kfd.c

+4 −0
Original line number Diff line number Diff line
@@ -390,6 +390,10 @@ static int kgd_set_pasid_vmid_mapping(struct kgd_dev *kgd, unsigned int pasid, 
		cpu_relax();

	write_register(kgd, ATC_VMID_PASID_MAPPING_UPDATE_STATUS, 1U << vmid);



	/* Mapping vmid to pasid also for IH block */

	write_register(kgd, IH_VMID_0_LUT + vmid * sizeof(uint32_t),

			pasid_mapping);



	return 0;

}