S2A doorbell entry 5 on nbio v7.11.5 is used by vpe v2.2
Signed-off-by: Caden Chien <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c
b/drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c
index 28a99b52f59f..872ebb4b3820 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c
@@ -145,7 +145,8 @@ static void nbif_v6_3_1_vcn_doorbell_range(struct
amdgpu_device *adev,
u32 doorbell_range;
if (instance) {
- if (amdgpu_ip_version(adev, NBIO_HWIP, 0) == IP_VERSION(7, 11,
4))
+ if (amdgpu_ip_version(adev, NBIO_HWIP, 0) == IP_VERSION(7, 11,
4) ||
+ amdgpu_ip_version(adev, NBIO_HWIP, 0) == IP_VERSION(7,
11, 5))
return;
doorbell_range = RREG32_SOC15(NBIO, 0,
regGDC_S2A0_S2A_DOORBELL_ENTRY_5_CTRL);
} else {
@@ -179,7 +180,8 @@ static void nbif_v6_3_1_vcn_doorbell_range(struct
amdgpu_device *adev,
S2A_DOORBELL_PORT4_RANGE_SIZE,
0);
- if (amdgpu_ip_version(adev, NBIO_HWIP, 0) == IP_VERSION(7, 11, 4)) {
+ if (amdgpu_ip_version(adev, NBIO_HWIP, 0) == IP_VERSION(7, 11, 4) ||
+ amdgpu_ip_version(adev, NBIO_HWIP, 0) == IP_VERSION(7, 11, 5)) {
WREG32_SOC15(NBIO, 0,
regGDC_S2A0_S2A_DOORBELL_ENTRY_4_CTRL_nbif_4_10, doorbell_range);
} else {
if (instance)
--
2.53.0
