Merge tag 'drm-misc-next-2020-10-27' of git://anongit.freedesktop.org/drm/drm-misc...

drm-misc-next for 5.11:

UAPI Changes:

  - doc: rules for EBUSY on non-blocking commits; requirements for fourcc
    modifiers; on parsing EDID
  - fbdev/sbuslib: Remove unused FBIOSCURSOR32
  - fourcc: deprecate DRM_FORMAT_MOD_NONE
  - virtio: Support blob resources for memory allocations; Expose host-visible
    and cross-device features

Cross-subsystem Changes:

  - devicetree: Add vendor Prefix for Yes Optoelectronics, Shanghai Top Display
    Optoelectronics
  - dma-buf: Add struct dma_buf_map that stores DMA pointer and I/O-memory flag;
    dma_buf_vmap()/vunmap() return address in dma_buf_map; Use struct_size() macro

Core Changes:

  - atomic: pass full state to CRTC atomic enable/disable; warn for EBUSY during
    non-blocking commits
  - dp: Prepare for DP 2.0 DPCD
  - dp_mst: Receive extended DPCD caps
  - dma-buf: Documentation
  - doc: Format modifiers; dma-buf-map; Cleanups
  - fbdev: Don't use compat_alloc_user_space(); mark as orphaned
  - fb-helper: Take lock in drm_fb_helper_restore_work_fb()
  - gem: Convert implementation and drivers to GEM object functions, remove
    GEM callbacks from struct drm_driver (expect gem_prime_mmap)
  - panel: Cleanups
  - pci: Add legacy infix to drm_irq_by_busid()
  - sched: Avoid infinite waits in drm_sched_entity_destroy()
  - switcheroo: Cleanups
  - ttm: Remove AGP support; Don't modify caching during swapout; Major
    refactoring of the implementation and API that affects all depending
    drivers; Add ttm_bo_wait_ctx(); Add ttm_bo_pin()/unpin() in favor of
    TTM_PL_FLAG_NO_EVICT; Remove ttm_bo_create(); Remove fault_reserve_notify()
    callback; Push move() implementation into drivers; Remove TTM_PAGE_FLAG_WRITE;
    Replace caching flags with init-time cache setting; Push ttm_tt_bind() into
    drivers; Replace move_notify() with delete_mem_notify(); No overlapping memcpy();
    no more ttm_set_populated()
  - vram-helper: Fix BO top-down placement; TTM-related changes; Init GEM
    object functions with defaults; Default placement in system memory; Cleanups

Driver Changes:

  - amdgpu: Use GEM object functions
  - armada: Use GEM object functions
  - aspeed: Configure output via sysfs; Init struct drm_driver with
  - ast: Reload LUT after FB format changes
  - bridge: Add driver and DT bindings for anx7625; Cleanups
  - bridge/dw-hdmi: Constify ops
  - bridge/ti-sn65dsi86: Add retries for link training
  - bridge/lvds-codec: Add support for regulator
  - bridge/tc358768: Restore connector support DRM_GEM_CMA_DRIVEROPS; Cleanups
  - display/ti,j721e-dss: Add DT properies assigned-clocks, assigned-clocks-parent and
    dma-coherent
  - display/ti,am65s-dss: Add DT properies assigned-clocks, assigned-clocks-parent and
    dma-coherent
  - etnaviv: Use GEM object functions
  - exynos: Use GEM object functions
  - fbdev: Cleanups and compiler fixes throughout framebuffer drivers
  - fbdev/cirrusfb: Avoid division by 0
  - gma500: Use GEM object functions; Fix double-free of connector; Cleanups
  - hisilicon/hibmc: I2C-based DDC support; Use to_hibmc_drm_device(); Cleanups
  - i915: Use GEM object functions
  - imx/dcss: Init driver with DRM_GEM_CMA_DRIVER_OPS; Cleanups
  - ingenic: Reset pixel clock when parent clock changes; support reserved
    memory; Alloc F0 and F1 DMA channels at once; Support different pixel formats;
    Revert support for cached mmap buffers
    on F0/F1; support 30-bit/24-bit/8-bit-palette modes
  - komeda: Use DEFINE_SHOW_ATTRIBUTE
  - mcde: Detect platform_get_irq() errors
  - mediatek: Use GEM object functions
  - msm: Use GEM object functions
  - nouveau: Cleanups; TTM-related changes; Use GEM object functions
  - omapdrm: Use GEM object functions
  - panel: Add driver and DT bindings for Novatak nt36672a; Add driver and DT
    bindings for YTC700TLAG-05-201C; Add driver and DT bindings for TDO TL070WSH30;
    Cleanups
  - panel/mantix: Fix reset; Fix deref of NULL pointer in mantix_get_modes()
  - panel/otm8009a: Allow non-continuous dsi clock; Cleanups
  - panel/rm68200: Allow non-continuous dsi clock; Fix mode to 50 FPS
  - panfrost: Fix job timeout handling; Cleanups
  - pl111: Use GEM object functions
  - qxl: Cleanups; TTM-related changes; Pin new BOs with ttm_bo_init_reserved()
  - radeon: Cleanups; TTM-related changes; Use GEM object functions
  - rockchip: Use GEM object functions
  - shmobile: Cleanups
  - tegra: Use GEM object functions
  - tidss: Set drm_plane_helper_funcs.prepare_fb
  - tilcdc: Don't keep vblank interrupt enabled all the time
  - tve200: Detect platform_get_irq() errors
  - vc4: Use GEM object functions; Only register components once DSI is attached;
    Add Maxime as maintainer
  - vgem: Use GEM object functions
  - via: Simplify critical section in via_mem_alloc()
  - virtgpu: Use GEM object functions
  - virtio: Implement blob resources, host-visible and cross-device features;
    Support mapping of host-allocated resources; Use UUID APi; Cleanups
  - vkms: Use GEM object functions; Switch to SHMEM
  - vmwgfx: TTM-related changes; Inline ttm_bo_swapout_all()
  - xen: Use GEM object functions
  - xlnx: Use GEM object functions

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201027100936.GA4858@linux-uq9g

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_fb_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_gem.c
index 69c2c079d8036bcde1d17b717c50ea5168cea2a1,1da67d34e55d6327399079135ec3316d1e17cfed..d586068f55091242c081650fd86679e70f26fac5
--- 1/drivers/gpu/drm/drm_gem.c
--- 2/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@@ -1085,9 -1076,7 +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 9f955f2010c25770f53110a2ff92ba98d0caadf4,4910c446db836a7036aabf68c9a1c15beba9427f..187b55ede62ec4a1b665e351aa45863a98652752
--- 1/drivers/gpu/drm/drm_prime.c
--- 2/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@@ -622,17 -619,18 +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 f56414a06ec416c74cdcfccfa34e817bf1def64f,5ba9b49dfa7a55956e37954a5fe6d2a20d509690..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
@@@ -706,10 -753,12 +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;
@@@ -770,9 -826,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/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 07945ca238e2d93741a7df8db1c21c56f56e7f74,c1824f5369367e9add5afeaf5f8359b0e9ddec01..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
@@@ -1024,11 -1027,14 +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/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 include/drm/drm_dp_helper.h
index a53243abd9450508bb302d59122607dede8eb049,ae4e20245ba393d4032092f1d93ded827004ce9d..1f0ee7f3f473c63cedbfeffb2e1e78135d344b3a
--- 1/include/drm/drm_dp_helper.h
--- 2/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@@ -1003,16 -1035,7 +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