Commit 51d334d6 authored by Joshua Aberback's avatar Joshua Aberback Committed by Alex Deucher
Browse files

drm/amd/display: Assume 32 bpp cursor in DML21 



[Why]
Cursor size can change dynamically at runtime without re-validation,
so DML should calculate with the max size cursor to cover all cases.

Reviewed-by: default avatarDillon Varone <dillon.varone@amd.com>
Signed-off-by: default avatarJoshua Aberback <joshua.aberback@amd.com>
Signed-off-by: default avatarWayne Lin <wayne.lin@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7b2363e0

drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c

+1 −12
Original line number Diff line number Diff line
@@ -725,18 +725,7 @@ static void populate_dml21_plane_config_from_plane_state(struct dml2_context *dm 
	const struct scaler_data *scaler_data = get_scaler_data_for_plane(dml_ctx, plane_state, context);

	struct dc_stream_state *stream = context->streams[stream_index];



	if (stream->cursor_attributes.color_format == CURSOR_MODE_MONO)

		plane->cursor.cursor_bpp = 2;

	else if (stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_1BIT_AND

		|| stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_PRE_MULTIPLIED_ALPHA

		|| stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_UN_PRE_MULTIPLIED_ALPHA) {

	plane->cursor.cursor_bpp = 32;

	} else if (stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_64BIT_FP_PRE_MULTIPLIED

		|| stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_64BIT_FP_UN_PRE_MULTIPLIED) {

		plane->cursor.cursor_bpp = 64;

	} else

		plane->cursor.cursor_bpp = 32;



	plane->cursor.cursor_width = 256;

	plane->cursor.num_cursors = 1;