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

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

drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2( 
		return true;

#endif

	case DCE_VERSION_12_0:

	case DCE_VERSION_12_1:

		*h = dal_cmd_tbl_helper_dce112_get_table2();

		return true;

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+5 −1
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) 
			dc_version = DCE_VERSION_11_22;

		break;

	case FAMILY_AI:

		if (ASICREV_IS_VEGA20_P(asic_id.hw_internal_rev))

			dc_version = DCE_VERSION_12_1;

		else

			dc_version = DCE_VERSION_12_0;

		break;

#if defined(CONFIG_DRM_AMD_DC_DCN1_0)
@@ -136,6 +139,7 @@ struct resource_pool *dc_create_resource_pool( 
			num_virtual_links, dc);

		break;

	case DCE_VERSION_12_0:

	case DCE_VERSION_12_1:

		res_pool = dce120_create_resource_pool(

			num_virtual_links, dc);

		break;

drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ bool dal_hw_factory_init( 
		dal_hw_factory_dce110_init(factory);

		return true;

	case DCE_VERSION_12_0:

	case DCE_VERSION_12_1:

		dal_hw_factory_dce120_init(factory);

		return true;

#if defined(CONFIG_DRM_AMD_DC_DCN1_0)

drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ bool dal_hw_translate_init( 
		dal_hw_translate_dce110_init(translate);

		return true;

	case DCE_VERSION_12_0:

	case DCE_VERSION_12_1:

		dal_hw_translate_dce120_init(translate);

		return true;

#if defined(CONFIG_DRM_AMD_DC_DCN1_0)

drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ struct i2caux *dal_i2caux_create( 
	case DCE_VERSION_10_0:

		return dal_i2caux_dce100_create(ctx);

	case DCE_VERSION_12_0:

	case DCE_VERSION_12_1:

		return dal_i2caux_dce120_create(ctx);

#if defined(CONFIG_DRM_AMD_DC_DCN1_0)

	case DCN_VERSION_1_0:

CRA Git | Maintained and supported by SUSTech CRA and CCSE