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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/accel/ivpu/ivpu_hw_37xx.c
index 4ab1f14cf3604fba54de46bfd85aa9b90bf978bc,4ccf1994b97adbf8e8f9add7e3ff67d3bb5b3567..e33dfe3089af322e8391ab0ad88f73e51d300765
--- 1/drivers/accel/ivpu/ivpu_hw_37xx.c
--- 2/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;
  
-       if (!ivpu_hw_37xx_is_idle(vdev)) {
 +      ivpu_hw_37xx_save_d0i3_entry_timestamp(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;
        }
  

diff --cc drivers/gpu/drm/i915/i915_driver.c
Simple merge