drm/amdgpu: change code name to ip version for tmz set

Use IP version rather then code name of IPs for
tmz set.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Alexander Deucher <Alexander.Deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index 88b852b3a2cb63f9a9f56c3a4c74c744b977b217..7e55ee61f84cfce71f1a65de4306cbbc7e888867 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -512,9 +512,12 @@ int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev)
  */
 void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
 {
-       switch (adev->asic_type) {
-       case CHIP_RAVEN:
-       case CHIP_RENOIR:
+       switch (adev->ip_versions[GC_HWIP][0]) {
+       /* RAVEN */
+       case IP_VERSION(9, 2, 2):
+       case IP_VERSION(9, 1, 0):
+       /* RENOIR looks like RAVEN */
+       case IP_VERSION(9, 3, 0):
                if (amdgpu_tmz == 0) {
                        adev->gmc.tmz_enabled = false;
                        dev_info(adev->dev,
@@ -525,12 +528,18 @@ void amdgpu_gmc_tmz_set(struct amdgpu_device *adev)
                                 "Trusted Memory Zone (TMZ) feature enabled\n");
                }
                break;
-       case CHIP_NAVI10:
-       case CHIP_NAVI14:
-       case CHIP_NAVI12:
-       case CHIP_VANGOGH:
-       case CHIP_YELLOW_CARP:
-       case CHIP_IP_DISCOVERY:
+       case IP_VERSION(10, 1, 10):
+       case IP_VERSION(10, 1, 1):
+       case IP_VERSION(10, 1, 2):
+       case IP_VERSION(10, 1, 3):
+       case IP_VERSION(10, 3, 0):
+       case IP_VERSION(10, 3, 2):
+       case IP_VERSION(10, 3, 4):
+       case IP_VERSION(10, 3, 5):
+       /* VANGOGH */
+       case IP_VERSION(10, 3, 1):
+       /* YELLOW_CARP*/
+       case IP_VERSION(10, 3, 3):
                /* Don't enable it by default yet.
                 */
                if (amdgpu_tmz < 1) {