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

We need commit f8f6ae5d077a ("mm: always have io_remap_pfn_range() set
pgprot_decrypted()") to be able to merge Jason's cleanup patch.

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

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

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

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

diff --cc drivers/gpu/drm/i915/i915_drv.c
index b15d206dca3adbca5f43fdad4cbe576fff1baff0,d6e25212d5c05cd33a001a5d1c4ef0f097d2f7aa..f2389ba49c69b753380aff4fde182aead96afba7
--- 1/drivers/gpu/drm/i915/i915_drv.c
--- 2/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@@ -84,9 -84,10 +84,10 @@@
  #include "intel_gvt.h"
  #include "intel_memory_region.h"
  #include "intel_pm.h"
+ #include "intel_sideband.h"
  #include "vlv_suspend.h"
  
 -static struct drm_driver driver;
 +static const struct drm_driver driver;
  
  static int i915_get_bridge_dev(struct drm_i915_private *dev_priv)
  {

diff --cc drivers/gpu/drm/imx/imx-drm-core.c
Simple merge

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

diff --cc drivers/gpu/drm/radeon/radeon.h
Simple merge

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

diff --cc drivers/gpu/drm/vc4/vc4_drv.h
index fe078648e0f51dbd82b9ef03389efbce672883ff,40f1192fff025bffb36fa6d2c64293f57dade3b4..137c382256d5d8d47ba632c361cf3832adb144ab
--- 1/drivers/gpu/drm/vc4/vc4_drv.h
--- 2/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@@ -806,9 -807,8 +807,8 @@@ int vc4_prime_mmap(struct drm_gem_objec
  struct drm_gem_object *vc4_prime_import_sg_table(struct drm_device *dev,
                                                 struct dma_buf_attachment *attach,
                                                 struct sg_table *sgt);
 -void *vc4_prime_vmap(struct drm_gem_object *obj);
 +int vc4_prime_vmap(struct drm_gem_object *obj, struct dma_buf_map *map);
  int vc4_bo_cache_init(struct drm_device *dev);
- void vc4_bo_cache_destroy(struct drm_device *dev);
  int vc4_bo_inc_usecnt(struct vc4_bo *bo);
  void vc4_bo_dec_usecnt(struct vc4_bo *bo);
  void vc4_bo_add_to_purgeable_pool(struct vc4_bo *bo);