Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 542816ff authored by Roman Li's avatar Roman Li Committed by Alex Deucher
Browse files

drm/amd/display: Add DCN2.1 changes to DML 



Hook up the DML changes for renoir.

Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarRoman Li <Roman.Li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f82effc4

drivers/gpu/drm/amd/display/dc/dml/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -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))

drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c

+19 −0
Original line number Diff line number Diff line
@@ -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;

	}