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>

diff --git a/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c b/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c
index 65776602648dccc7e20e5e969e66084ece267aed..b0de8920f7e7c5805a46ed5c0e366a853851effb 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c
+++ b/drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c
@@ -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_bpp = 32;
        plane->cursor.cursor_width = 256;
        plane->cursor.num_cursors = 1;