Commit 01933ba4 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher

drm/amd/display: Use current connector state if NULL when checking bpc

[Why]
The old logic for checking which output depth to use relied on using
the current connector state rather than the new proposed state. This
was a problem when performing atomic commits since we weren't verifying
it against the incoming max_requested_bpc.

But switching this to only use the new state and not the current state
breaks filtering modes - it'll always assume that the maximum bpc
supported by the display is in use, which will cause certain modes
like 1440p@144Hz to be filtered even when using 8bpc.

[How]
Still use the connector->state if we aren't passed an explicit state.
This will respect the max_bpc the user currently has when filtering
modes.

Also remember to reset the default max_requested_bpc to 8 whenever
connector reset is called to retain old behavior when using the new
property.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110845Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b4559a16
...@@ -2971,6 +2971,9 @@ convert_color_depth_from_display_info(const struct drm_connector *connector, ...@@ -2971,6 +2971,9 @@ convert_color_depth_from_display_info(const struct drm_connector *connector,
{ {
uint32_t bpc = connector->display_info.bpc; uint32_t bpc = connector->display_info.bpc;
if (!state)
state = connector->state;
if (state) { if (state) {
bpc = state->max_bpc; bpc = state->max_bpc;
/* Round down to the nearest even number. */ /* Round down to the nearest even number. */
...@@ -3733,6 +3736,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector) ...@@ -3733,6 +3736,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)
state->underscan_enable = false; state->underscan_enable = false;
state->underscan_hborder = 0; state->underscan_hborder = 0;
state->underscan_vborder = 0; state->underscan_vborder = 0;
state->base.max_requested_bpc = 8;
__drm_atomic_helper_connector_reset(connector, &state->base); __drm_atomic_helper_connector_reset(connector, &state->base);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment