Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Dillon Varone <dillon.varone@amd.com>
Signed-off-by: Joshua Aberback <joshua.aberback@amd.com>
Signed-off-by: Wayne Lin <wayne.lin@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Joshua Aberback and committed by
Alex Deucher
51d334d6 7b2363e0

+1 -12
+1 -12
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c
··· 725 725 const struct scaler_data *scaler_data = get_scaler_data_for_plane(dml_ctx, plane_state, context); 726 726 struct dc_stream_state *stream = context->streams[stream_index]; 727 727 728 - if (stream->cursor_attributes.color_format == CURSOR_MODE_MONO) 729 - plane->cursor.cursor_bpp = 2; 730 - else if (stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_1BIT_AND 731 - || stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_PRE_MULTIPLIED_ALPHA 732 - || stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_UN_PRE_MULTIPLIED_ALPHA) { 733 - plane->cursor.cursor_bpp = 32; 734 - } else if (stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_64BIT_FP_PRE_MULTIPLIED 735 - || stream->cursor_attributes.color_format == CURSOR_MODE_COLOR_64BIT_FP_UN_PRE_MULTIPLIED) { 736 - plane->cursor.cursor_bpp = 64; 737 - } else 738 - plane->cursor.cursor_bpp = 32; 739 - 728 + plane->cursor.cursor_bpp = 32; 740 729 plane->cursor.cursor_width = 256; 741 730 plane->cursor.num_cursors = 1; 742 731