From: jsg <jsg@openbsd.org>
Date: Mon, 19 Jul 2021 10:12:33 +0000 (+0000)
Subject: drm/amd/display: Update scaling settings on modeset
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=320891c366184b07bc4e365774c2963cd4a5aaf7;p=openbsd

drm/amd/display: Update scaling settings on modeset

From Roman Li
01d6a693196595d356f0f5e42ab155c293470676 in linux 5.10.y/5.10.51
c521fc316d12fb9ea7b7680e301d673bceda922e in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 36f817b6763..d6a25c262e7 100644
--- a/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/sys/dev/pci/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -8305,7 +8305,8 @@ skip_modeset:
 	BUG_ON(dm_new_crtc_state->stream == NULL);
 
 	/* Scaling or underscan settings */
-	if (is_scaling_state_different(dm_old_conn_state, dm_new_conn_state))
+	if (is_scaling_state_different(dm_old_conn_state, dm_new_conn_state) ||
+				drm_atomic_crtc_needs_modeset(new_crtc_state))
 		update_stream_scaling_settings(
 			&new_crtc_state->mode, dm_new_conn_state, dm_new_crtc_state->stream);