Skip to content

Commit cb841d2

Browse files
Harry Wentlandalexdeucher
authored andcommitted
drm/amd/display: Always pass connector_state to stream validation
We need the connector_state for colorspace and scaling information and can get it from connector->state. Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Joshua Ashton <joshua@froggi.es> Cc: Pekka Paalanen <ppaalanen@gmail.com> Cc: Sebastian Wick <sebastian.wick@redhat.com> Cc: Vitaly.Prosyak@amd.com Cc: Joshua Ashton <joshua@froggi.es> Cc: Simon Ser <contact@emersion.fr> Cc: Melissa Wen <mwen@igalia.com> Cc: dri-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent c265f34 commit cb841d2

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5955,15 +5955,14 @@ create_stream_for_sink(struct amdgpu_dm_connector *aconnector,
59555955
{
59565956
struct drm_display_mode *preferred_mode = NULL;
59575957
struct drm_connector *drm_connector;
5958-
const struct drm_connector_state *con_state =
5959-
dm_state ? &dm_state->base : NULL;
5958+
const struct drm_connector_state *con_state = &dm_state->base;
59605959
struct dc_stream_state *stream = NULL;
59615960
struct drm_display_mode mode;
59625961
struct drm_display_mode saved_mode;
59635962
struct drm_display_mode *freesync_mode = NULL;
59645963
bool native_mode_found = false;
59655964
bool recalculate_timing = false;
5966-
bool scale = dm_state ? (dm_state->scaling != RMX_OFF) : false;
5965+
bool scale = dm_state->scaling != RMX_OFF;
59675966
int mode_refresh;
59685967
int preferred_refresh = 0;
59695968
enum color_transfer_func tf = TRANSFER_FUNC_UNKNOWN;
@@ -6605,7 +6604,9 @@ enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connec
66056604
goto fail;
66066605
}
66076606

6608-
stream = create_validate_stream_for_sink(aconnector, mode, NULL, NULL);
6607+
stream = create_validate_stream_for_sink(aconnector, mode,
6608+
to_dm_connector_state(connector->state),
6609+
NULL);
66096610
if (stream) {
66106611
dc_stream_release(stream);
66116612
result = MODE_OK;

0 commit comments

Comments
 (0)