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

Commit 09f2317b authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher
Browse files

drm/amd/display: change dml vba cursor count define to correct one 



Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c81a351a

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -633,7 +633,7 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib) 
		mode_lib->vba.NumberOfCursors[mode_lib->vba.NumberOfActivePlanes] = 0;

		mode_lib->vba.NumberOfCursors[mode_lib->vba.NumberOfActivePlanes] = 0;

		// The DML spreadsheet assumes that the two cursors utilize the same amount of bandwidth. We'll

		// The DML spreadsheet assumes that the two cursors utilize the same amount of bandwidth. We'll

		// calculate things a little more accurately

		// calculate things a little more accurately

		for (k = 0; k < DC__NUM_CURSOR; ++k) {

		for (k = 0; k < DC__NUM_CURSOR__MAX; ++k) {

			switch (k) {

			switch (k) {

			case 0:

			case 0:

				mode_lib->vba.CursorBPP[mode_lib->vba.NumberOfActivePlanes][0] =

				mode_lib->vba.CursorBPP[mode_lib->vba.NumberOfActivePlanes][0] =

drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -332,8 +332,8 @@ struct vba_vars_st { 
	unsigned int BlendingAndTiming[DC__NUM_DPP__MAX];

	unsigned int BlendingAndTiming[DC__NUM_DPP__MAX];

	bool SynchronizedVBlank;

	bool SynchronizedVBlank;

	unsigned int NumberOfCursors[DC__NUM_DPP__MAX];

	unsigned int NumberOfCursors[DC__NUM_DPP__MAX];

	unsigned int CursorWidth[DC__NUM_DPP__MAX][DC__NUM_CURSOR];

	unsigned int CursorWidth[DC__NUM_DPP__MAX][DC__NUM_CURSOR__MAX];

	unsigned int CursorBPP[DC__NUM_DPP__MAX][DC__NUM_CURSOR];

	unsigned int CursorBPP[DC__NUM_DPP__MAX][DC__NUM_CURSOR__MAX];

	bool XFCEnabled[DC__NUM_DPP__MAX];

	bool XFCEnabled[DC__NUM_DPP__MAX];

	bool ScalerEnabled[DC__NUM_DPP__MAX];

	bool ScalerEnabled[DC__NUM_DPP__MAX];