diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3652-drm-amd-display-Add-DCN2.1-changes-to-DML.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3652-drm-amd-display-Add-DCN2.1-changes-to-DML.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3652-drm-amd-display-Add-DCN2.1-changes-to-DML.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3652-drm-amd-display-Add-DCN2.1-changes-to-DML.patch new file mode 100644 index 00000000..bb4ee152 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3652-drm-amd-display-Add-DCN2.1-changes-to-DML.patch @@ -0,0 +1,77 @@ +From 509a4a79c9089c05320777c8ee54d33c676db771 Mon Sep 17 00:00:00 2001 +From: Roman Li <Roman.Li@amd.com> +Date: Thu, 8 Aug 2019 15:14:25 -0400 +Subject: [PATCH 3652/4256] drm/amd/display: Add DCN2.1 changes to DML + +Hook up the DML changes for renoir. + +Acked-by: Harry Wentland <harry.wentland@amd.com> +Signed-off-by: Roman Li <Roman.Li@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 ++++ + .../drm/amd/display/dc/dml/display_mode_lib.c | 19 +++++++++++++++++++ + 2 files changed, 23 insertions(+) + +diff --git a/drivers/gpu/drm/amd/display/dc/dml/Makefile b/drivers/gpu/drm/amd/display/dc/dml/Makefile +index b267c0fc64e7..af2a864a6da0 100644 +--- a/drivers/gpu/drm/amd/display/dc/dml/Makefile ++++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile +@@ -63,6 +63,10 @@ ifdef CONFIG_DRM_AMD_DC_DCN2_0 + DML += display_mode_vba.o dcn20/display_rq_dlg_calc_20.o dcn20/display_mode_vba_20.o + DML += dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o + endif ++ifdef CONFIG_DRM_AMD_DC_DCN2_1 ++DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o ++endif ++ + + AMD_DAL_DML = $(addprefix $(AMDDALPATH)/dc/dml/,$(DML)) + +diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c +index 96dfcd8c36bc..704efefdcba8 100644 +--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c ++++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c +@@ -31,6 +31,10 @@ + #include "dcn20/display_mode_vba_20v2.h" + #include "dcn20/display_rq_dlg_calc_20v2.h" + #endif ++#ifdef CONFIG_DRM_AMD_DC_DCN2_1 ++#include "dcn21/display_mode_vba_21.h" ++#include "dcn21/display_rq_dlg_calc_21.h" ++#endif + + #if defined(CONFIG_DRM_AMD_DC_DCN2_0) + const struct dml_funcs dml20_funcs = { +@@ -48,6 +52,15 @@ const struct dml_funcs dml20v2_funcs = { + }; + #endif + ++#ifdef CONFIG_DRM_AMD_DC_DCN2_1 ++const struct dml_funcs dml21_funcs = { ++ .validate = dml21_ModeSupportAndSystemConfigurationFull, ++ .recalculate = dml21_recalculate, ++ .rq_dlg_get_dlg_reg = dml21_rq_dlg_get_dlg_reg, ++ .rq_dlg_get_rq_reg = dml21_rq_dlg_get_rq_reg ++}; ++#endif ++ + void dml_init_instance(struct display_mode_lib *lib, + const struct _vcs_dpi_soc_bounding_box_st *soc_bb, + const struct _vcs_dpi_ip_params_st *ip_params, +@@ -65,6 +78,12 @@ void dml_init_instance(struct display_mode_lib *lib, + lib->funcs = dml20v2_funcs; + break; + #endif ++#ifdef CONFIG_DRM_AMD_DC_DCN2_1 ++ case DML_PROJECT_DCN21: ++ lib->funcs = dml21_funcs; ++ break; ++#endif ++ + default: + break; + } +-- +2.17.1 + |