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

We haven't done any backmerge for a while due to the merge window, and it
starts to become an issue for komeda. Let's bring 5.4-rc1 in.

Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --cc MAINTAINERS
index 6372c43,296de2b..94fb077
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5324,8 -5375,7 +5377,8 @@@ F:      include/uapi/drm/drm
  F:    include/linux/vga*
  
  DRM DRIVERS FOR ALLWINNER A10
- M:    Maxime Ripard  <maxime.ripard@bootlin.com>
+ M:    Maxime Ripard <mripard@kernel.org>
 +M:    Chen-Yu Tsai <wens@csie.org>
  L:    dri-devel@lists.freedesktop.org
  S:    Supported
  F:    drivers/gpu/drm/sun4i/

diff --cc drivers/gpu/drm/Kconfig
Simple merge

diff --cc drivers/gpu/drm/Makefile
Simple merge

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 513dd84,dff41d0..8e867b8
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -1728,8 -1731,7 +1731,8 @@@ int amdgpu_ttm_init(struct amdgpu_devic
        r = ttm_bo_device_init(&adev->mman.bdev,
                               &amdgpu_bo_driver,
                               adev->ddev->anon_inode->i_mapping,
-                              adev->need_dma32);
 +                             adev->ddev->vma_offset_manager,
+                              dma_addressing_limited(adev->dev));
        if (r) {
                DRM_ERROR("failed initializing buffer object driver(%d).\n", r);
                return r;

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

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/arm/display/komeda/komeda_dev.c
Simple merge

diff --cc drivers/gpu/drm/arm/display/komeda/komeda_kms.c
Simple merge

diff --cc drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
Simple merge

diff --cc drivers/gpu/drm/ast/ast_main.c
Simple merge

diff --cc drivers/gpu/drm/ast/ast_mode.c
Simple merge

diff --cc drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index aa7efd4,521d689..d77fb8a
--- 1/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
--- 2/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@@ -26,9 -26,7 +26,8 @@@
  
  #include <drm/bridge/dw_hdmi.h>
  #include <drm/drm_atomic_helper.h>
 +#include <drm/drm_bridge.h>
  #include <drm/drm_edid.h>
- #include <drm/drm_encoder_slave.h>
  #include <drm/drm_of.h>
  #include <drm/drm_print.h>
  #include <drm/drm_probe_helper.h>

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

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

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

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

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

diff --cc drivers/gpu/drm/etnaviv/etnaviv_buffer.c
index 803086c,7e4e295..32d9fac
--- 1/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
--- 2/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
@@@ -314,10 -326,11 +326,11 @@@ void etnaviv_buffer_queue(struct etnavi
  
        lockdep_assert_held(&gpu->lock);
  
 -      if (drm_debug & DRM_UT_DRIVER)
 +      if (drm_debug_enabled(DRM_UT_DRIVER))
                etnaviv_buffer_dump(gpu, buffer, 0, 0x50);
  
-       link_target = etnaviv_cmdbuf_get_va(cmdbuf);
+       link_target = etnaviv_cmdbuf_get_va(cmdbuf,
+                                           &gpu->mmu_context->cmdbuf_mapping);
        link_dwords = cmdbuf->size / 8;
  
        /*
@@@ -410,15 -455,17 +455,17 @@@
        CMD_LOAD_STATE(buffer, VIVS_GL_EVENT, VIVS_GL_EVENT_EVENT_ID(event) |
                       VIVS_GL_EVENT_FROM_PE);
        CMD_WAIT(buffer);
-       CMD_LINK(buffer, 2, etnaviv_cmdbuf_get_va(buffer) +
-                           buffer->user_size - 4);
+       CMD_LINK(buffer, 2,
+                etnaviv_cmdbuf_get_va(buffer, &gpu->mmu_context->cmdbuf_mapping)
+                + buffer->user_size - 4);
  
 -      if (drm_debug & DRM_UT_DRIVER)
 +      if (drm_debug_enabled(DRM_UT_DRIVER))
                pr_info("stream link to 0x%08x @ 0x%08x %p\n",
-                       return_target, etnaviv_cmdbuf_get_va(cmdbuf),
+                       return_target,
+                       etnaviv_cmdbuf_get_va(cmdbuf, &gpu->mmu_context->cmdbuf_mapping),
                        cmdbuf->vaddr);
  
 -      if (drm_debug & DRM_UT_DRIVER) {
 +      if (drm_debug_enabled(DRM_UT_DRIVER)) {
                print_hex_dump(KERN_INFO, "cmd ", DUMP_PREFIX_OFFSET, 16, 4,
                               cmdbuf->vaddr, cmdbuf->size, 0);
  

diff --cc drivers/gpu/drm/hisilicon/hibmc/Kconfig
index 8ad9a5b,35a3c5f..dfc5aef
--- 1/drivers/gpu/drm/hisilicon/hibmc/Kconfig
--- 2/drivers/gpu/drm/hisilicon/hibmc/Kconfig
+++ b/drivers/gpu/drm/hisilicon/hibmc/Kconfig
@@@ -1,11 -1,10 +1,11 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  config DRM_HISI_HIBMC
        tristate "DRM Support for Hisilicon Hibmc"
-       depends on DRM && PCI && MMU
+       depends on DRM && PCI && MMU && ARM64
        select DRM_KMS_HELPER
        select DRM_VRAM_HELPER
 -
 +      select DRM_TTM
 +      select DRM_TTM_HELPER
        help
          Choose this option if you have a Hisilicon Hibmc soc chipset.
          If M is selected the module will be called hibmc-drm.

diff --cc drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/mcde/mcde_drv.c
Simple merge

diff --cc drivers/gpu/drm/mcde/mcde_dsi.c
Simple merge

diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
Simple merge

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

diff --cc drivers/gpu/drm/msm/hdmi/hdmi.h
index 4aba397,bdac452..d0b84f0
--- 1/drivers/gpu/drm/msm/hdmi/hdmi.h
--- 2/drivers/gpu/drm/msm/hdmi/hdmi.h
+++ b/drivers/gpu/drm/msm/hdmi/hdmi.h
@@@ -11,10 -11,9 +11,11 @@@
  #include <linux/clk.h>
  #include <linux/platform_device.h>
  #include <linux/regulator/consumer.h>
+ #include <linux/gpio/consumer.h>
  #include <linux/hdmi.h>
  
 +#include <drm/drm_bridge.h>
 +
  #include "msm_drv.h"
  #include "hdmi.xml.h"
  

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

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

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

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

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

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

diff --cc drivers/gpu/drm/qxl/qxl_drv.c
Simple merge

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

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

diff --cc drivers/gpu/drm/radeon/radeon_ttm.c
index a46bb30,a05e107..098bc9f
--- 1/drivers/gpu/drm/radeon/radeon_ttm.c
--- 2/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@@ -794,8 -794,7 +794,8 @@@ int radeon_ttm_init(struct radeon_devic
        r = ttm_bo_device_init(&rdev->mman.bdev,
                               &radeon_bo_driver,
                               rdev->ddev->anon_inode->i_mapping,
-                              rdev->need_dma32);
 +                             rdev->ddev->vma_offset_manager,
+                              dma_addressing_limited(&rdev->pdev->dev));
        if (r) {
                DRM_ERROR("failed initializing buffer object driver(%d).\n", r);
                return r;

diff --cc drivers/gpu/drm/sun4i/sun4i_tcon.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
index 881cf26,20ff56f..c7f8649
--- 1/drivers/gpu/drm/ttm/ttm_bo.c
--- 2/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@@ -672,7 -672,10 +672,10 @@@ static void ttm_bo_release(struct kref 
        struct ttm_bo_device *bdev = bo->bdev;
        struct ttm_mem_type_manager *man = &bdev->man[bo->mem.mem_type];
  
 -      drm_vma_offset_remove(&bdev->vma_manager, &bo->base.vma_node);
+       if (bo->bdev->driver->release_notify)
+               bo->bdev->driver->release_notify(bo);
+ 
 +      drm_vma_offset_remove(bdev->vma_manager, &bo->base.vma_node);
        ttm_mem_io_lock(man, false);
        ttm_mem_io_free_vm(bo);
        ttm_mem_io_unlock(man);

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

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
Simple merge

diff --cc drivers/video/fbdev/sa1100fb.c
Simple merge

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

diff --cc include/drm/ttm/ttm_bo_driver.h
Simple merge