Merge drm/drm-next into drm-misc-next

Daniel needs -rc2 in drm-misc-next to merge some patches

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc Documentation/driver-api/dma-buf.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma-buf/dma-buf.c
Simple merge

diff --cc drivers/dma-buf/heaps/heap-helpers.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
Simple merge

diff --cc drivers/gpu/drm/armada/armada_gem.c
Simple merge

diff --cc drivers/gpu/drm/drm_dp_mst_topology.c
Simple merge

diff --cc drivers/gpu/drm/drm_edid.c
Simple merge

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_gem.c
index 1da67d34e55d6327399079135ec3316d1e17cfed,69c2c079d8036bcde1d17b717c50ea5168cea2a1..d586068f55091242c081650fd86679e70f26fac5
--- 1/drivers/gpu/drm/drm_gem.c
--- 2/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@@ -1076,7 -1085,9 +1076,9 @@@ int drm_gem_mmap_obj(struct drm_gem_obj
         */
        drm_gem_object_get(obj);
  
 -      if (obj->funcs && obj->funcs->mmap) {
+       vma->vm_private_data = obj;
+ 
 +      if (obj->funcs->mmap) {
                ret = obj->funcs->mmap(obj, vma);
                if (ret) {
                        drm_gem_object_put(obj);

diff --cc drivers/gpu/drm/drm_gem_cma_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_gem_shmem_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_prime.c
index 4910c446db836a7036aabf68c9a1c15beba9427f,9f955f2010c25770f53110a2ff92ba98d0caadf4..187b55ede62ec4a1b665e351aa45863a98652752
--- 1/drivers/gpu/drm/drm_prime.c
--- 2/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@@ -619,18 -622,17 +620,19 @@@ struct sg_table *drm_gem_map_dma_buf(st
        if (WARN_ON(dir == DMA_NONE))
                return ERR_PTR(-EINVAL);
  
 -      if (obj->funcs)
 -              sgt = obj->funcs->get_sg_table(obj);
 -      else
 -              sgt = obj->dev->driver->gem_prime_get_sg_table(obj);
 +      if (WARN_ON(!obj->funcs->get_sg_table))
 +              return ERR_PTR(-ENOSYS);
 +
 +      sgt = obj->funcs->get_sg_table(obj);
 +      if (IS_ERR(sgt))
 +              return sgt;
  
-       if (!dma_map_sg_attrs(attach->dev, sgt->sgl, sgt->nents, dir,
-                             DMA_ATTR_SKIP_CPU_SYNC)) {
+       ret = dma_map_sgtable(attach->dev, sgt, dir,
+                             DMA_ATTR_SKIP_CPU_SYNC);
+       if (ret) {
                sg_free_table(sgt);
                kfree(sgt);
-               sgt = ERR_PTR(-ENOMEM);
+               sgt = ERR_PTR(ret);
        }
  
        return sgt;

diff --cc drivers/gpu/drm/etnaviv/etnaviv_gem.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_gem.c
Simple merge

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

diff --cc drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c
Simple merge

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

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

diff --cc drivers/gpu/drm/mediatek/mtk_drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_drm_gem.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 5ba9b49dfa7a55956e37954a5fe6d2a20d509690,f56414a06ec416c74cdcfccfa34e817bf1def64f..6a24ce245a373606c9ab5b78b220c43924e6f3f1
--- 1/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
--- 2/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@@ -753,12 -706,10 +707,12 @@@ static struct drm_crtc_state *dpu_crtc_
  }
  
  static void dpu_crtc_disable(struct drm_crtc *crtc,
 -                           struct drm_crtc_state *old_crtc_state)
 +                           struct drm_atomic_state *state)
  {
-       struct dpu_crtc *dpu_crtc;
-       struct dpu_crtc_state *cstate;
 +      struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state,
 +                                                                            crtc);
+       struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+       struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
        struct drm_encoder *encoder;
        unsigned long flags;
        bool release_bandwidth = false;
@@@ -826,9 -770,9 +773,9 @@@
  }
  
  static void dpu_crtc_enable(struct drm_crtc *crtc,
 -              struct drm_crtc_state *old_crtc_state)
 +              struct drm_atomic_state *state)
  {
-       struct dpu_crtc *dpu_crtc;
+       struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
        struct drm_encoder *encoder;
        bool request_bandwidth = false;
  

diff --cc drivers/gpu/drm/msm/msm_drv.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.h
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_gem.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_mem.c
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_gem.c
Simple merge

diff --cc drivers/gpu/drm/panfrost/panfrost_gem.c
Simple merge

diff --cc drivers/gpu/drm/panfrost/panfrost_mmu.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_display.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/rockchip_drm_gem.c
Simple merge

diff --cc drivers/gpu/drm/tegra/gem.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

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

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

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

diff --cc drivers/gpu/drm/virtio/virtgpu_object.c
Simple merge

diff --cc drivers/gpu/drm/virtio/virtgpu_vq.c
index c1824f5369367e9add5afeaf5f8359b0e9ddec01,07945ca238e2d93741a7df8db1c21c56f56e7f74..857f730747b61c099484909b0fcf88bbf82b07ad
--- 1/drivers/gpu/drm/virtio/virtgpu_vq.c
--- 2/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@@ -1027,14 -1024,11 +1026,12 @@@ void virtio_gpu_cmd_transfer_to_host_3d
        struct virtio_gpu_transfer_host_3d *cmd_p;
        struct virtio_gpu_vbuffer *vbuf;
        bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev);
 -      struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);
  
 -      if (use_dma_api)
 +      if (virtio_gpu_is_shmem(bo) && use_dma_api) {
 +              struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);
- 
-               dma_sync_sg_for_device(vgdev->vdev->dev.parent,
-                                      shmem->pages->sgl, shmem->pages->nents,
-                                      DMA_TO_DEVICE);
+               dma_sync_sgtable_for_device(vgdev->vdev->dev.parent,
+                                           shmem->pages, DMA_TO_DEVICE);
 +      }
  
        cmd_p = virtio_gpu_alloc_cmd(vgdev, &vbuf, sizeof(*cmd_p));
        memset(cmd_p, 0, sizeof(*cmd_p));

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
Simple merge

diff --cc drivers/gpu/drm/xen/xen_drm_front_gem.c
Simple merge

diff --cc drivers/iommu/io-pgtable-arm.c
Simple merge

diff --cc drivers/media/common/videobuf2/videobuf2-dma-contig.c
Simple merge

diff --cc drivers/media/common/videobuf2/videobuf2-dma-sg.c
Simple merge

diff --cc drivers/media/common/videobuf2/videobuf2-vmalloc.c
Simple merge

diff --cc drivers/misc/fastrpc.c
Simple merge

diff --cc drivers/video/console/sticore.c
Simple merge

diff --cc include/drm/drm_dp_helper.h
index ae4e20245ba393d4032092f1d93ded827004ce9d,a53243abd9450508bb302d59122607dede8eb049..1f0ee7f3f473c63cedbfeffb2e1e78135d344b3a
--- 1/include/drm/drm_dp_helper.h
--- 2/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@@ -1035,7 -1003,16 +1054,17 @@@ struct drm_device
  #define DP_CEC_TX_MESSAGE_BUFFER               0x3020
  #define DP_CEC_MESSAGE_BUFFER_LENGTH             0x10
  
+ #define DP_PROTOCOL_CONVERTER_CONTROL_0               0x3050 /* DP 1.3 */
+ # define DP_HDMI_DVI_OUTPUT_CONFIG            (1 << 0) /* DP 1.3 */
+ #define DP_PROTOCOL_CONVERTER_CONTROL_1               0x3051 /* DP 1.3 */
+ # define DP_CONVERSION_TO_YCBCR420_ENABLE     (1 << 0) /* DP 1.3 */
+ # define DP_HDMI_EDID_PROCESSING_DISABLE      (1 << 1) /* DP 1.4 */
+ # define DP_HDMI_AUTONOMOUS_SCRAMBLING_DISABLE        (1 << 2) /* DP 1.4 */
+ # define DP_HDMI_FORCE_SCRAMBLING             (1 << 3) /* DP 1.4 */
+ #define DP_PROTOCOL_CONVERTER_CONTROL_2               0x3052 /* DP 1.3 */
+ # define DP_CONVERSION_TO_YCBCR422_ENABLE     (1 << 0) /* DP 1.3 */
+ 
 +/* HDCP 1.3 and HDCP 2.2 */
  #define DP_AUX_HDCP_BKSV              0x68000
  #define DP_AUX_HDCP_RI_PRIME          0x68005
  #define DP_AUX_HDCP_AKSV              0x68007

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

diff --cc include/linux/font.h
Simple merge