Commit b8b6ce89 authored by Leo Li's avatar Leo Li Committed by Alex Deucher

drm/amd/display: Add DCE_VERSION_12_1 enum for Vega 20

[Why]
We'll need a way to differentiate Vega 20 in DC

[How]
Add a DCE_VERSION_12_1 enum, which will be returned as the DC version if
the ASIC used is a Vega 20.
Signed-off-by: default avatarLeo Li <sunpeng.li@amd.com>
Reviewed-by: default avatarDavid Francis <David.Francis@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 180db303
...@@ -67,6 +67,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2( ...@@ -67,6 +67,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
return true; return true;
#endif #endif
case DCE_VERSION_12_0: case DCE_VERSION_12_0:
case DCE_VERSION_12_1:
*h = dal_cmd_tbl_helper_dce112_get_table2(); *h = dal_cmd_tbl_helper_dce112_get_table2();
return true; return true;
......
...@@ -83,7 +83,10 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) ...@@ -83,7 +83,10 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
dc_version = DCE_VERSION_11_22; dc_version = DCE_VERSION_11_22;
break; break;
case FAMILY_AI: case FAMILY_AI:
dc_version = DCE_VERSION_12_0; if (ASICREV_IS_VEGA20_P(asic_id.hw_internal_rev))
dc_version = DCE_VERSION_12_1;
else
dc_version = DCE_VERSION_12_0;
break; break;
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
case FAMILY_RV: case FAMILY_RV:
...@@ -136,6 +139,7 @@ struct resource_pool *dc_create_resource_pool( ...@@ -136,6 +139,7 @@ struct resource_pool *dc_create_resource_pool(
num_virtual_links, dc); num_virtual_links, dc);
break; break;
case DCE_VERSION_12_0: case DCE_VERSION_12_0:
case DCE_VERSION_12_1:
res_pool = dce120_create_resource_pool( res_pool = dce120_create_resource_pool(
num_virtual_links, dc); num_virtual_links, dc);
break; break;
......
...@@ -79,6 +79,7 @@ bool dal_hw_factory_init( ...@@ -79,6 +79,7 @@ bool dal_hw_factory_init(
dal_hw_factory_dce110_init(factory); dal_hw_factory_dce110_init(factory);
return true; return true;
case DCE_VERSION_12_0: case DCE_VERSION_12_0:
case DCE_VERSION_12_1:
dal_hw_factory_dce120_init(factory); dal_hw_factory_dce120_init(factory);
return true; return true;
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
......
...@@ -76,6 +76,7 @@ bool dal_hw_translate_init( ...@@ -76,6 +76,7 @@ bool dal_hw_translate_init(
dal_hw_translate_dce110_init(translate); dal_hw_translate_dce110_init(translate);
return true; return true;
case DCE_VERSION_12_0: case DCE_VERSION_12_0:
case DCE_VERSION_12_1:
dal_hw_translate_dce120_init(translate); dal_hw_translate_dce120_init(translate);
return true; return true;
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
......
...@@ -90,6 +90,7 @@ struct i2caux *dal_i2caux_create( ...@@ -90,6 +90,7 @@ struct i2caux *dal_i2caux_create(
case DCE_VERSION_10_0: case DCE_VERSION_10_0:
return dal_i2caux_dce100_create(ctx); return dal_i2caux_dce100_create(ctx);
case DCE_VERSION_12_0: case DCE_VERSION_12_0:
case DCE_VERSION_12_1:
return dal_i2caux_dce120_create(ctx); return dal_i2caux_dce120_create(ctx);
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
case DCN_VERSION_1_0: case DCN_VERSION_1_0:
......
...@@ -42,6 +42,7 @@ enum dce_version { ...@@ -42,6 +42,7 @@ enum dce_version {
DCE_VERSION_11_2, DCE_VERSION_11_2,
DCE_VERSION_11_22, DCE_VERSION_11_22,
DCE_VERSION_12_0, DCE_VERSION_12_0,
DCE_VERSION_12_1,
DCE_VERSION_MAX, DCE_VERSION_MAX,
DCN_VERSION_1_0, DCN_VERSION_1_0,
#if defined(CONFIG_DRM_AMD_DC_DCN1_01) #if defined(CONFIG_DRM_AMD_DC_DCN1_01)
......
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