Merge drm/drm-fixes into drm-misc-fixes

Backmerging to get v6.1-rc1.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
index c7bf189d50deff7bfed19cfea745e66c1c418c13,2b0669c464f636442589a96f91fed29dae28a600..69e105fa41f68461e58e91c1444fdd9246977449
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
@@@ -112,18 -112,12 +112,19 @@@ static int amdgpu_vm_sdma_commit(struc
                swap(p->vm->last_unlocked, tmp);
                dma_fence_put(tmp);
        } else {
-               amdgpu_bo_fence(p->vm->root.bo, f, true);
+               dma_resv_add_fence(p->vm->root.bo->tbo.base.resv, f,
+                                  DMA_RESV_USAGE_BOOKKEEP);
        }
  
 -      if (fence && !p->immediate)
 +      if (fence && !p->immediate) {
 +              /*
 +               * Most hw generations now have a separate queue for page table
 +               * updates, but when the queue is shared with userspace we need
 +               * the extra CPU round trip to correctly flush the TLB.
 +               */
 +              set_bit(DRM_SCHED_FENCE_DONT_PIPELINE, &f->flags);
                swap(*fence, f);
 +      }
        dma_fence_put(f);
        return 0;
  

diff --cc drivers/gpu/drm/vc4/vc4_drv.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index 874c6bd787c5667c8ec73d6d1d29bbced9f25b17,64f9feabf43ef92c63ad7f8c4e164650e452d7e4..596e311d6e58eaf7c2c914b531643f7d34979052
--- 1/drivers/gpu/drm/vc4/vc4_hdmi.c
--- 2/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -2921,12 -3345,15 +3370,19 @@@ static int vc4_hdmi_runtime_resume(stru
  #endif
  
        return 0;
 +
 +err_disable_clk:
 +      clk_disable_unprepare(vc4_hdmi->hsm_clock);
 +      return ret;
  }
  
+ static void vc4_hdmi_put_ddc_device(void *ptr)
+ {
+       struct vc4_hdmi *vc4_hdmi = ptr;
+ 
+       put_device(&vc4_hdmi->ddc->dev);
+ }
+ 
  static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
  {
        const struct vc4_hdmi_variant *variant = of_device_get_match_data(dev);

diff --cc include/drm/gpu_scheduler.h
Simple merge