diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0956-drm-amd-display-Add-DCE_VERSION_12_1-enum-for-Vega-2.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0956-drm-amd-display-Add-DCE_VERSION_12_1-enum-for-Vega-2.patch | 112 |
1 files changed, 112 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0956-drm-amd-display-Add-DCE_VERSION_12_1-enum-for-Vega-2.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0956-drm-amd-display-Add-DCE_VERSION_12_1-enum-for-Vega-2.patch new file mode 100644 index 00000000..3e01c03e --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0956-drm-amd-display-Add-DCE_VERSION_12_1-enum-for-Vega-2.patch @@ -0,0 +1,112 @@ +From 4539d783347f0bd68088d411a322620d46e49ae5 Mon Sep 17 00:00:00 2001 +From: Leo Li <sunpeng.li@amd.com> +Date: Wed, 31 Oct 2018 16:56:54 -0400 +Subject: [PATCH 0956/2940] 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: Leo Li <sunpeng.li@amd.com> +Reviewed-by: David Francis <David.Francis@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 6 +++++- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 1 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + 6 files changed, 10 insertions(+), 1 deletion(-) + +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 b8aad13e3273..1cc471c9afae 100644 +--- a/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c ++++ b/drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c +@@ -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; + +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 d57842743f51..dda459f3b0da 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -83,7 +83,10 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) + dc_version = DCE_VERSION_11_22; + break; + 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; + #ifdef CONFIG_X86 + case FAMILY_RV: +@@ -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; +diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c +index 875c0f3e3470..f4c91490d261 100644 +--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c ++++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c +@@ -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; + #ifdef CONFIG_X86 +diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c +index f67ce5a5ec98..aebf3a93ff4a 100644 +--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c ++++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c +@@ -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; + #ifdef CONFIG_X86 +diff --git a/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c b/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c +index c3f20fc3ce60..a18fc4fca864 100644 +--- a/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c ++++ b/drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c +@@ -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); + #ifdef CONFIG_X86 + case DCN_VERSION_1_0: +diff --git a/drivers/gpu/drm/amd/display/include/dal_types.h b/drivers/gpu/drm/amd/display/include/dal_types.h +index 89627133e188..f5bd869d4320 100644 +--- a/drivers/gpu/drm/amd/display/include/dal_types.h ++++ b/drivers/gpu/drm/amd/display/include/dal_types.h +@@ -42,6 +42,7 @@ enum dce_version { + DCE_VERSION_11_2, + DCE_VERSION_11_22, + DCE_VERSION_12_0, ++ DCE_VERSION_12_1, + DCE_VERSION_MAX, + DCN_VERSION_1_0, + #if defined(CONFIG_DRM_AMD_DC_DCN1_01) +-- +2.17.1 + |