From: jsg <jsg@openbsd.org>
Date: Wed, 25 Jan 2023 01:58:44 +0000 (+0000)
Subject: drm/amd/display: Fix set scaling doesn's work
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=23537d219115eca13ae0ef16e43ce0e2679f6740;p=openbsd

drm/amd/display: Fix set scaling doesn's work

From hongao
032cebdff71e92d6aa6fd2a8550eb7c9898553e0 in linux-6.1.y/6.1.8
040625ab82ce6dca7772cb3867fe5c9eb279a344 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 708775aadb1..5f565dfbafd 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
@@ -9437,8 +9437,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
 			goto fail;
 		}
 
-		if (dm_old_con_state->abm_level !=
-		    dm_new_con_state->abm_level)
+		if (dm_old_con_state->abm_level != dm_new_con_state->abm_level ||
+		    dm_old_con_state->scaling != dm_new_con_state->scaling)
 			new_crtc_state->connectors_changed = true;
 	}