Skip to content

Commit a0b433c

Browse files
Harry Wentlandalexdeucher
authored andcommitted
drm/amd/display: Signal mode_changed if colorspace changed
We need to signal mode_changed to make sure we update the output colorspace. v2: No need to call drm_hdmi_avi_infoframe_colorimetry as DC does its own infoframe packing. Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Leo Li <sunpeng.li@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: Uma Shankar <uma.shankar@intel.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 15f9dfd commit a0b433c

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6700,6 +6700,14 @@ amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
67006700
if (!crtc)
67016701
return 0;
67026702

6703+
if (new_con_state->colorspace != old_con_state->colorspace) {
6704+
new_crtc_state = drm_atomic_get_crtc_state(state, crtc);
6705+
if (IS_ERR(new_crtc_state))
6706+
return PTR_ERR(new_crtc_state);
6707+
6708+
new_crtc_state->mode_changed = true;
6709+
}
6710+
67036711
if (!drm_connector_atomic_hdr_metadata_equal(old_con_state, new_con_state)) {
67046712
struct dc_info_packet hdr_infopacket;
67056713

@@ -6722,7 +6730,7 @@ amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
67226730
* set is permissible, however. So only force a
67236731
* modeset if we're entering or exiting HDR.
67246732
*/
6725-
new_crtc_state->mode_changed =
6733+
new_crtc_state->mode_changed = new_crtc_state->mode_changed ||
67266734
!old_con_state->hdr_output_metadata ||
67276735
!new_con_state->hdr_output_metadata;
67286736
}

0 commit comments

Comments
 (0)