From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 28 Nov 2023 10:52:51 +0000 (+0100)
Subject: Merge v6.7-rc3 into drm-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a13fee31f56449fc600d9e064c7b32302f92dcef;p=linux.git

Merge v6.7-rc3 into drm-next

Thomas Zimermann needs 8d6ef26501 ("drm/ast: Disconnect BMC if
physical connector is connected") for further ast work in -next.

Minor conflicts in ivpu between 3de6d9597892 ("accel/ivpu: Pass D0i3
residency time to the VPU firmware") and 3f7c0634926d
("accel/ivpu/37xx: Fix hangs related to MMIO reset") changing adjacent
lines.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

a13fee31f56449fc600d9e064c7b32302f92dcef
diff --cc drivers/accel/ivpu/ivpu_hw_37xx.c
index 4ab1f14cf3604,4ccf1994b97ad..e33dfe3089af3
--- a/drivers/accel/ivpu/ivpu_hw_37xx.c
+++ b/drivers/accel/ivpu/ivpu_hw_37xx.c
@@@ -731,16 -720,11 +733,13 @@@ static int ivpu_hw_37xx_power_down(stru
  {
  	int ret = 0;
  
 +	ivpu_hw_37xx_save_d0i3_entry_timestamp(vdev);
 +
- 	if (!ivpu_hw_37xx_is_idle(vdev)) {
+ 	if (!ivpu_hw_37xx_is_idle(vdev))
  		ivpu_warn(vdev, "VPU not idle during power down\n");
- 		if (ivpu_hw_37xx_reset(vdev))
- 			ivpu_warn(vdev, "Failed to reset the VPU\n");
- 	}
  
- 	if (ivpu_pll_disable(vdev)) {
- 		ivpu_err(vdev, "Failed to disable PLL\n");
+ 	if (ivpu_hw_37xx_reset(vdev)) {
+ 		ivpu_err(vdev, "Failed to reset VPU\n");
  		ret = -EIO;
  	}