diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3644-drm-amd-display-Handle-Renoir-in-DC.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3644-drm-amd-display-Handle-Renoir-in-DC.patch | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3644-drm-amd-display-Handle-Renoir-in-DC.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3644-drm-amd-display-Handle-Renoir-in-DC.patch new file mode 100644 index 00000000..23168df3 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3644-drm-amd-display-Handle-Renoir-in-DC.patch @@ -0,0 +1,86 @@ +From 06de19e73d091f20522eeebb62e857ec56befeca Mon Sep 17 00:00:00 2001 +From: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> +Date: Fri, 26 Jul 2019 17:06:02 -0400 +Subject: [PATCH 3644/4256] 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> +--- + .../drm/amd/display/dc/bios/command_table_helper2.c | 5 +++++ + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 12 ++++++++++++ + drivers/gpu/drm/amd/display/include/dal_types.h | 3 +++ + 3 files changed, 20 insertions(+) + +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 f9439dfc7b75..db153ddf0fee 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 +@@ -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 adbf2d4e1723..2ae883a248da 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -49,6 +49,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) +@@ -98,6 +101,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 + +@@ -165,6 +172,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 1e3ce4d847ae..fcc42372b6cf 100644 +--- 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 + }; +-- +2.17.1 + |