drm/amdgpu: add support for NBIO IP version 7.11.2

This initializes NBIO IP version 7.11.2.

Signed-off-by: Tim Huang <tim.huang@amd.com>
Reviewed-by: Yifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 27b90fc7967e0351567f56367df612341755a577..49d3d017c6578dfdc0e72659baf66f3517bf4313 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2778,6 +2778,7 @@ int amdgpu_discovery_set_ip_blocks(struct amdgpu_device *adev)
                break;
        case IP_VERSION(7, 11, 0):
        case IP_VERSION(7, 11, 1):
+       case IP_VERSION(7, 11, 2):
        case IP_VERSION(7, 11, 3):
                adev->nbio.funcs = &nbio_v7_11_funcs;
                adev->nbio.hdp_flush_reg = &nbio_v7_11_hdp_flush_reg;

diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
index ba889a85cdc5160cc66cc0f65cde504e1d16e7eb..e1dad7ca5b5c457272edac44ca7c5cb1624b8920 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -962,6 +962,7 @@ static int soc21_common_set_clockgating_state(struct amdgpu_ip_block *ip_block,
        case IP_VERSION(7, 7, 1):
        case IP_VERSION(7, 11, 0):
        case IP_VERSION(7, 11, 1):
+       case IP_VERSION(7, 11, 2):
        case IP_VERSION(7, 11, 3):
                adev->nbio.funcs->update_medium_grain_clock_gating(adev,
                                state == AMD_CG_STATE_GATE);