Merge tag 'drm-misc-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-misc...

drm-misc-next for 5.13:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:
  - mst: Improve topology logging
  - edid: Rework and improvements for displayid

Driver Changes:
  - anx7625: Regulators support
  - bridge: Support for the Chipone ICN6211, Lontium LT8912B
  - lt9611: Fix 4k panels handling

Signed-off-by: Dave Airlie <[email protected]>
From: Maxime Ripard <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20210401110552.2b3yetlgsjtlotcn@gilmour

diff --combined MAINTAINERS
index fa231a491463973cf075fd1156e389b221ea15b5,a247285596f9d00871913c7b9bec9815930e926b..632763cb47fc035d08fda1e5127317adde3c7d58
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5568,6 -5568,12 +5568,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/boe,himax8279d.yaml
  F:    drivers/gpu/drm/panel/panel-boe-himax8279d.c
  
+ DRM DRIVER FOR CHIPONE ICN6211 MIPI-DSI to RGB CONVERTER BRIDGE
+ M:    Jagan Teki <[email protected]>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
+ F:    drivers/gpu/drm/bridge/chipone-icn6211.c
+ 
  DRM DRIVER FOR FARADAY TVE200 TV ENCODER
  M:    Linus Walleij <[email protected]>
  S:    Maintained
@@@ -5586,6 -5592,14 +5592,14 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
  F:    drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
+ DRM DRIVER FOR GENERIC USB DISPLAY
+ M:    Noralf Trønnes <[email protected]>
+ S:    Maintained
+ W:    https://github.com/notro/gud/wiki
+ T:    git git://anongit.freedesktop.org/drm/drm-misc
+ F:    drivers/gpu/drm/gud/
+ F:    include/drm/gud.h
+ 
  DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
  M:    Hans de Goede <[email protected]>
  S:    Maintained
@@@ -5894,6 -5908,7 +5908,7 @@@ F:      drivers/gpu/drm/atmel-hlcdc
  DRM DRIVERS FOR BRIDGE CHIPS
  M:    Andrzej Hajda <[email protected]>
  M:    Neil Armstrong <[email protected]>
+ M:    Robert Foss <[email protected]>
  R:    Laurent Pinchart <[email protected]>
  R:    Jonas Karlman <[email protected]>
  R:    Jernej Skrabec <[email protected]>
@@@ -5988,9 -6003,9 +6003,9 @@@ L:      [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://linuxtv.org/pinchartl/media drm/du/next
 -F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.txt
 +F:    Documentation/devicetree/bindings/display/bridge/renesas,dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
 -F:    Documentation/devicetree/bindings/display/renesas,du.txt
 +F:    Documentation/devicetree/bindings/display/renesas,du.yaml
  F:    drivers/gpu/drm/rcar-du/
  F:    drivers/gpu/drm/shmobile/
  F:    include/linux/platform_data/shmob_drm.h
@@@ -10460,6 -10475,12 +10475,12 @@@ S: Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
  F:    drivers/hid/hid-lg-g15.c
  
+ LONTIUM LT8912B MIPI TO HDMI BRIDGE
+ M:    Adrien Grassein <[email protected]>
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
+ F:    drivers/gpu/drm/bridge/lontium-lt8912b.c
+ 
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Sathya Prakash <[email protected]>
  M:    Sreekanth Reddy <[email protected]>

diff --combined drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index e8cafc97eada2aa0650e646b35e2d236b5f91cb3,ae18c0e32347d19e240812b4e509619a8f0bf273..f314e1e269cdff8fa81b993f3a25136769813abf
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@@ -92,13 -92,13 +92,13 @@@ struct amdgpu_prt_cb 
  static inline void amdgpu_vm_eviction_lock(struct amdgpu_vm *vm)
  {
        mutex_lock(&vm->eviction_lock);
 -      vm->saved_flags = memalloc_nofs_save();
 +      vm->saved_flags = memalloc_noreclaim_save();
  }
  
  static inline int amdgpu_vm_eviction_trylock(struct amdgpu_vm *vm)
  {
        if (mutex_trylock(&vm->eviction_lock)) {
 -              vm->saved_flags = memalloc_nofs_save();
 +              vm->saved_flags = memalloc_noreclaim_save();
                return 1;
        }
        return 0;
@@@ -106,7 -106,7 +106,7 @@@
  
  static inline void amdgpu_vm_eviction_unlock(struct amdgpu_vm *vm)
  {
 -      memalloc_nofs_restore(vm->saved_flags);
 +      memalloc_noreclaim_restore(vm->saved_flags);
        mutex_unlock(&vm->eviction_lock);
  }
  
@@@ -638,15 -638,15 +638,15 @@@ void amdgpu_vm_move_to_lru_tail(struct 
        struct amdgpu_vm_bo_base *bo_base;
  
        if (vm->bulk_moveable) {
-               spin_lock(&ttm_glob.lru_lock);
+               spin_lock(&adev->mman.bdev.lru_lock);
                ttm_bo_bulk_move_lru_tail(&vm->lru_bulk_move);
-               spin_unlock(&ttm_glob.lru_lock);
+               spin_unlock(&adev->mman.bdev.lru_lock);
                return;
        }
  
        memset(&vm->lru_bulk_move, 0, sizeof(vm->lru_bulk_move));
  
-       spin_lock(&ttm_glob.lru_lock);
+       spin_lock(&adev->mman.bdev.lru_lock);
        list_for_each_entry(bo_base, &vm->idle, vm_status) {
                struct amdgpu_bo *bo = bo_base->bo;
  
@@@ -660,7 -660,7 +660,7 @@@
                                                &bo->shadow->tbo.mem,
                                                &vm->lru_bulk_move);
        }
-       spin_unlock(&ttm_glob.lru_lock);
+       spin_unlock(&adev->mman.bdev.lru_lock);
  
        vm->bulk_moveable = true;
  }