drm/amd/display: add more cyan skillfish devices

[ Upstream commit 3cf06bd4cf2512d564fdb451b07de0cebe7b138d ]

Add PCI IDs to support display probe for cyan skillfish
family of SOCs.

Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 6dbf139c51f727560b6de6ae1bdcb54c1fc42ab7..36f8eb37e6710b4ff3469ed0dfc16e6c6f363947 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -164,7 +164,13 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
 
        case FAMILY_NV:
                dc_version = DCN_VERSION_2_0;
-               if (asic_id.chip_id == DEVICE_ID_NV_13FE || asic_id.chip_id == DEVICE_ID_NV_143F) {
+               if (asic_id.chip_id == DEVICE_ID_NV_13FE ||
+                   asic_id.chip_id == DEVICE_ID_NV_143F ||
+                   asic_id.chip_id == DEVICE_ID_NV_13F9 ||
+                   asic_id.chip_id == DEVICE_ID_NV_13FA ||
+                   asic_id.chip_id == DEVICE_ID_NV_13FB ||
+                   asic_id.chip_id == DEVICE_ID_NV_13FC ||
+                   asic_id.chip_id == DEVICE_ID_NV_13DB) {
                        dc_version = DCN_VERSION_2_01;
                        break;
                }

diff --git a/drivers/gpu/drm/amd/display/include/dal_asic_id.h b/drivers/gpu/drm/amd/display/include/dal_asic_id.h
index 090230d29df828e9200de23e13a21d8f43b61a50..f030e167c58e1e1113839047b74b4f9b28c49894 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/dal_asic_id.h
+++ b/drivers/gpu/drm/amd/display/include/dal_asic_id.h
@@ -213,6 +213,11 @@ enum {
 #endif
 #define DEVICE_ID_NV_13FE 0x13FE  // CYAN_SKILLFISH
 #define DEVICE_ID_NV_143F 0x143F
+#define DEVICE_ID_NV_13F9 0x13F9
+#define DEVICE_ID_NV_13FA 0x13FA
+#define DEVICE_ID_NV_13FB 0x13FB
+#define DEVICE_ID_NV_13FC 0x13FC
+#define DEVICE_ID_NV_13DB 0x13DB
 #define FAMILY_VGH 144
 #define DEVICE_ID_VGH_163F 0x163F
 #define DEVICE_ID_VGH_1435 0x1435