diff options
| author | Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> | 2019-06-05 12:33:59 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-11 12:44:34 -0500 |
| commit | 01933ba42d3d9fd0917573a752b81267ec231849 (patch) | |
| tree | 038ec4444da8d539f6168561699007e241174964 /drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | |
| parent | b4559a16467a13a12a660f31edec1801e2a5b16b (diff) | |
| download | linux-01933ba42d3d9fd0917573a752b81267ec231849.tar.bz2 | |
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=110845
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index d3c39ff6d7e2..5c83c441877a 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2971,6 +2971,9 @@ convert_color_depth_from_display_info(const struct drm_connector *connector, { uint32_t bpc = connector->display_info.bpc; + if (!state) + state = connector->state; + if (state) { bpc = state->max_bpc; /* Round down to the nearest even number. */ @@ -3733,6 +3736,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector) state->underscan_enable = false; state->underscan_hborder = 0; state->underscan_vborder = 0; + state->base.max_requested_bpc = 8; __drm_atomic_helper_connector_reset(connector, &state->base); } |