From: Thomas Zimmermann <tzimmermann@suse.de>
Date: Thu, 20 Oct 2022 07:09:00 +0000 (+0200)
Subject: Merge drm/drm-fixes into drm-misc-fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1aca5ce036e3499336d1a2ace3070f908381c055;p=linux.git

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

Backmerging to get v6.1-rc1.

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

1aca5ce036e3499336d1a2ace3070f908381c055
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
index c7bf189d50def,2b0669c464f63..69e105fa41f68
--- a/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_hdmi.c
index 874c6bd787c56,64f9feabf43ef..596e311d6e58e
--- a/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);