diff options
| author | Ben Goz <ben.goz@amd.com> | 2014-12-17 13:09:10 +0100 |
|---|---|---|
| committer | Oded Gabbay <oded.gabbay@amd.com> | 2014-12-17 13:09:10 +0100 |
| commit | fec77bb50fd0b94cb502cd3745e8b5c4a6e9c404 (patch) | |
| tree | a748ee6d244279019dde3275940cf0dad0294a62 /drivers | |
| parent | drm/radeon: do not leave queue acquired if timeout happens in kgd_hqd_destroy() (diff) | |
| download | linux-fec77bb50fd0b94cb502cd3745e8b5c4a6e9c404.tar.xz linux-fec77bb50fd0b94cb502cd3745e8b5c4a6e9c404.zip | |
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: Ben Goz <ben.goz@amd.com>
Signed-off-by: Oded Gabbay <oded.gabbay@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/radeon/cikd.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kfd.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/cikd.h b/drivers/gpu/drm/radeon/cikd.h index ba85986febea..03003f8a6de6 100644 --- a/drivers/gpu/drm/radeon/cikd.h +++ b/drivers/gpu/drm/radeon/cikd.h @@ -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 diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c index a55afbadc65f..8bf87f1203cc 100644 --- a/drivers/gpu/drm/radeon/radeon_kfd.c +++ b/drivers/gpu/drm/radeon/radeon_kfd.c @@ -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; } |