drm/amdgpu: add RAVEN family id definition

RAVEN is a new APU.

Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index d1385eba6f43b339024b85e7756e68ae0294cb7c..d0a26fff53f3b06b73dc73653028c32dbaeaf681 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -79,6 +79,7 @@ static const char *amdgpu_asic_name[] = {
        "POLARIS11",
        "POLARIS12",
        "VEGA10",
+       "RAVEN",
        "LAST",
 };
 
@@ -1537,8 +1538,12 @@ static int amdgpu_early_init(struct amdgpu_device *adev)
                        return r;
                break;
 #endif
-       case CHIP_VEGA10:
-               adev->family = AMDGPU_FAMILY_AI;
+       case  CHIP_VEGA10:
+       case  CHIP_RAVEN:
+               if (adev->asic_type == CHIP_RAVEN)
+                       adev->family = AMDGPU_FAMILY_RV;
+               else
+                       adev->family = AMDGPU_FAMILY_AI;
 
                r = soc15_set_ip_blocks(adev);
                if (r)

diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index 1d1ac1ef94f7a4e48f1d46485ca28a07ec7d78b9..40486c7621d91dd12bd44a478c9a6a18fca855a7 100644 (file)
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -48,6 +48,7 @@ enum amd_asic_type {
        CHIP_POLARIS11,
        CHIP_POLARIS12,
        CHIP_VEGA10,
+       CHIP_RAVEN,
        CHIP_LAST,
 };
 

diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 56ceb3daaba52f70ac3e432cfb39a5aa97b57a40..0735f47e6a5bdb12f654e0399a71e813003d6e2c 100644 (file)
--- a/include/uapi/drm/amdgpu_drm.h
+++ b/include/uapi/drm/amdgpu_drm.h
@@ -860,6 +860,7 @@ struct drm_amdgpu_info_vce_clock_table {
 #define AMDGPU_FAMILY_VI                       130 /* Iceland, Tonga */
 #define AMDGPU_FAMILY_CZ                       135 /* Carrizo, Stoney */
 #define AMDGPU_FAMILY_AI                       141 /* Vega10 */
+#define AMDGPU_FAMILY_RV                       142 /* Raven */
 
 #if defined(__cplusplus)
 }