drm/amd/display: Handle Renoir in DC

add Renoir DCN version in DC and handle it

Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
index f9439df..db153dd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
+++ b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c
@@ -66,6 +66,11 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
        case DCN_VERSION_2_0:
                *h = dal_cmd_tbl_helper_dce112_get_table2();
                return true;
+#endif
+#if defined(CONFIG_DRM_AMD_DC_DCN2_1)
+       case DCN_VERSION_2_1:
+               *h = dal_cmd_tbl_helper_dce112_get_table2();
+               return true;
 #endif
        case DCE_VERSION_12_0:
        case DCE_VERSION_12_1:

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 5fb0c3d..8f70295 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -52,6 +52,9 @@
 #if defined(CONFIG_DRM_AMD_DC_DCN2_0)
 #include "dcn20/dcn20_resource.h"
 #endif
+#if defined(CONFIG_DRM_AMD_DC_DCN2_1)
+#include "dcn21/dcn21_resource.h"
+#endif
 #include "dce120/dce120_resource.h"
 
 #define DC_LOGGER_INIT(logger)
@@ -101,6 +104,10 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
                dc_version = DCN_VERSION_1_0;
                if (ASICREV_IS_RAVEN2(asic_id.hw_internal_rev))
                        dc_version = DCN_VERSION_1_01;
+#if defined(CONFIG_DRM_AMD_DC_DCN2_1)
+               if (ASICREV_IS_RENOIR(asic_id.hw_internal_rev))
+                       dc_version = DCN_VERSION_2_1;
+#endif
                break;
 #endif
 
@@ -168,6 +175,11 @@ struct resource_pool *dc_create_resource_pool(struct dc  *dc,
                res_pool = dcn20_create_resource_pool(init_data, dc);
                break;
 #endif
+#if defined(CONFIG_DRM_AMD_DC_DCN2_1)
+       case DCN_VERSION_2_1:
+               res_pool = dcn21_create_resource_pool(init_data, dc);
+               break;
+#endif
 
        default:
                break;

diff --git a/drivers/gpu/drm/amd/display/include/dal_types.h b/drivers/gpu/drm/amd/display/include/dal_types.h
index 1e3ce4d..fcc4237 100644 (file)
--- a/drivers/gpu/drm/amd/display/include/dal_types.h
+++ b/drivers/gpu/drm/amd/display/include/dal_types.h
@@ -48,6 +48,9 @@ enum dce_version {
        DCN_VERSION_1_01,
 #if defined(CONFIG_DRM_AMD_DC_DCN2_0)
        DCN_VERSION_2_0,
+#endif
+#if defined(CONFIG_DRM_AMD_DC_DCN2_1)
+       DCN_VERSION_2_1,
 #endif
        DCN_VERSION_MAX
 };