Commit e22ece54 authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher

drm/amd/display: Handle Renoir in DC

add Renoir DCN version in DC and handle it
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent aad37f26
...@@ -66,6 +66,11 @@ bool dal_bios_parser_init_cmd_tbl_helper2( ...@@ -66,6 +66,11 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
case DCN_VERSION_2_0: case DCN_VERSION_2_0:
*h = dal_cmd_tbl_helper_dce112_get_table2(); *h = dal_cmd_tbl_helper_dce112_get_table2();
return true; 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 #endif
case DCE_VERSION_12_0: case DCE_VERSION_12_0:
case DCE_VERSION_12_1: case DCE_VERSION_12_1:
......
...@@ -52,6 +52,9 @@ ...@@ -52,6 +52,9 @@
#if defined(CONFIG_DRM_AMD_DC_DCN2_0) #if defined(CONFIG_DRM_AMD_DC_DCN2_0)
#include "dcn20/dcn20_resource.h" #include "dcn20/dcn20_resource.h"
#endif #endif
#if defined(CONFIG_DRM_AMD_DC_DCN2_1)
#include "dcn21/dcn21_resource.h"
#endif
#include "dce120/dce120_resource.h" #include "dce120/dce120_resource.h"
#define DC_LOGGER_INIT(logger) #define DC_LOGGER_INIT(logger)
...@@ -101,6 +104,10 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) ...@@ -101,6 +104,10 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
dc_version = DCN_VERSION_1_0; dc_version = DCN_VERSION_1_0;
if (ASICREV_IS_RAVEN2(asic_id.hw_internal_rev)) if (ASICREV_IS_RAVEN2(asic_id.hw_internal_rev))
dc_version = DCN_VERSION_1_01; 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; break;
#endif #endif
...@@ -168,6 +175,11 @@ struct resource_pool *dc_create_resource_pool(struct dc *dc, ...@@ -168,6 +175,11 @@ struct resource_pool *dc_create_resource_pool(struct dc *dc,
res_pool = dcn20_create_resource_pool(init_data, dc); res_pool = dcn20_create_resource_pool(init_data, dc);
break; break;
#endif #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: default:
break; break;
......
...@@ -48,6 +48,9 @@ enum dce_version { ...@@ -48,6 +48,9 @@ enum dce_version {
DCN_VERSION_1_01, DCN_VERSION_1_01,
#if defined(CONFIG_DRM_AMD_DC_DCN2_0) #if defined(CONFIG_DRM_AMD_DC_DCN2_0)
DCN_VERSION_2_0, DCN_VERSION_2_0,
#endif
#if defined(CONFIG_DRM_AMD_DC_DCN2_1)
DCN_VERSION_2_1,
#endif #endif
DCN_VERSION_MAX DCN_VERSION_MAX
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment