aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChunming Zhou <David1.Zhou@amd.com>2016-12-07 04:31:19 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-05-24 17:40:49 -0400
commit2ca8a5d2ebd12c72c8b3e5ce251a02c0cc7e18b1 (patch)
treea12f83e4751946235168840e9b29775227dcce3b
parent702f9292ad60342a8bb0bd67ff61ab23ed84ab1b (diff)
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>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c9
-rw-r--r--drivers/gpu/drm/amd/include/amd_shared.h1
-rw-r--r--include/uapi/drm/amdgpu_drm.h1
3 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index d1385eba6f43..d0a26fff53f3 100644
--- 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[] = {
79 "POLARIS11", 79 "POLARIS11",
80 "POLARIS12", 80 "POLARIS12",
81 "VEGA10", 81 "VEGA10",
82 "RAVEN",
82 "LAST", 83 "LAST",
83}; 84};
84 85
@@ -1537,8 +1538,12 @@ static int amdgpu_early_init(struct amdgpu_device *adev)
1537 return r; 1538 return r;
1538 break; 1539 break;
1539#endif 1540#endif
1540 case CHIP_VEGA10: 1541 case CHIP_VEGA10:
1541 adev->family = AMDGPU_FAMILY_AI; 1542 case CHIP_RAVEN:
1543 if (adev->asic_type == CHIP_RAVEN)
1544 adev->family = AMDGPU_FAMILY_RV;
1545 else
1546 adev->family = AMDGPU_FAMILY_AI;
1542 1547
1543 r = soc15_set_ip_blocks(adev); 1548 r = soc15_set_ip_blocks(adev);
1544 if (r) 1549 if (r)
diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index 1d1ac1ef94f7..40486c7621d9 100644
--- 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 {
48 CHIP_POLARIS11, 48 CHIP_POLARIS11,
49 CHIP_POLARIS12, 49 CHIP_POLARIS12,
50 CHIP_VEGA10, 50 CHIP_VEGA10,
51 CHIP_RAVEN,
51 CHIP_LAST, 52 CHIP_LAST,
52}; 53};
53 54
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h
index 56ceb3daaba5..0735f47e6a5b 100644
--- 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 {
860#define AMDGPU_FAMILY_VI 130 /* Iceland, Tonga */ 860#define AMDGPU_FAMILY_VI 130 /* Iceland, Tonga */
861#define AMDGPU_FAMILY_CZ 135 /* Carrizo, Stoney */ 861#define AMDGPU_FAMILY_CZ 135 /* Carrizo, Stoney */
862#define AMDGPU_FAMILY_AI 141 /* Vega10 */ 862#define AMDGPU_FAMILY_AI 141 /* Vega10 */
863#define AMDGPU_FAMILY_RV 142 /* Raven */
863 864
864#if defined(__cplusplus) 865#if defined(__cplusplus)
865} 866}