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

Backmerging to get v5.12 fixes. Requested for vmwgfx.

Signed-off-by: Thomas Zimmermann <[email protected]>

diff --cc MAINTAINERS
Simple merge

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

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dc_link.h
Simple merge

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

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

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

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

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

diff --cc drivers/gpu/drm/tegra/drm.c
index b2dc3c6fefcbe0a2398360b37f2a2e8d300e7059,0c350b0daab47f29d9cdda8da307a20aaa070fe5..f96c237b22426c11bd6638ab14b0eddc07d253bf
--- 1/drivers/gpu/drm/tegra/drm.c
--- 2/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@@ -1122,10 -1121,11 +1122,9 @@@ static int host1x_drm_probe(struct host
  
        drm->mode_config.min_width = 0;
        drm->mode_config.min_height = 0;
- 
-       drm->mode_config.max_width = 4096;
-       drm->mode_config.max_height = 4096;
+       drm->mode_config.max_width = 0;
+       drm->mode_config.max_height = 0;
  
 -      drm->mode_config.allow_fb_modifiers = true;
 -
        drm->mode_config.normalize_zpos = true;
  
        drm->mode_config.funcs = &tegra_drm_mode_config_funcs;

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index e9ea971682888c2ac899014c4902cdf7f7975f8d,399f70d340eb5beb22e4676e92a953ba40c112d3..7805ba0e1c49095f7f1a9596b1470d9adfee95d6
--- 1/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
--- 2/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@@ -724,8 -715,16 +715,16 @@@ static int vmw_driver_load(struct vmw_p
        spin_lock_init(&dev_priv->cap_lock);
        spin_lock_init(&dev_priv->cursor_lock);
  
+       ret = vmw_setup_pci_resources(dev_priv, pci_id);
+       if (ret)
+               return ret;
+       ret = vmw_detect_version(dev_priv);
+       if (ret)
+               goto out_no_pci_or_version;
+ 
+ 
        for (i = vmw_res_context; i < vmw_res_max; ++i) {
 -              idr_init(&dev_priv->res_idr[i]);
 +              idr_init_base(&dev_priv->res_idr[i], 1);
                INIT_LIST_HEAD(&dev_priv->res_lru[i]);
        }
  

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