From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 11 Apr 2023 10:11:32 +0000 (+0200)
Subject: Merge tag 'drm-msm-next-2023-04-10' of https://gitlab.freedesktop.org/drm/msm into... 
X-Git-Tag: v6.4-rc1~162^2~6
X-Git-Url: http://git.infradead.org/users/dwmw2/static/?p=users%2Fhch%2Fmisc.git;a=commitdiff_plain;h=b8d85bb50511c901d48fc34ea8f0bb958042fbf0

Merge tag 'drm-msm-next-2023-04-10' of https://gitlab.freedesktop.org/drm/msm into drm-next

main pull request for v6.4

Core Display:
============
* Bugfixes for error handling during probe
* rework UBWC decoder programming
* prepare_commit cleanup
* bindings for SM8550 (MDSS, DPU), SM8450 (DP)
* timeout calculation fixup
* atomic: use drm_crtc_next_vblank_start() instead of our own
  custom thing to calculate the start of next vblank

DP:
==
* interrupts cleanup

DPU:
===
* DSPP sub-block flush on sc7280
* support AR30 in addition to XR30 format
* Allow using REC_0 and REC_1 to handle wide (4k) RGB planes
* Split the HW catalog into individual per-SoC files

DSI:
===
* rework DSI instance ID detection on obscure platforms

GPU:
===
* uapi C++ compatibility fix
* a6xx: More robust gdsc reset
* a3xx and a4xx devfreq support
* update generated headers
* various cleanups and fixes
* GPU and GEM updates to avoid allocations which could trigger
  reclaim (shrinker) in fence signaling path
* dma-fence deadline hint support and wait-boost
* a640 speedbin support
* a650 speedbin support

Conflicts in drivers/gpu/drm/msm/adreno/adreno_gpu.c:

Conflict between the 7fa5047a436b ("drm: Use of_property_present() for
testing DT property presence") and 9f251f934012 ("drm/msm/adreno: Use
OPP for every GPU generation"). The latter removed the of_ function
call outright, so I went with what's in the PR unchanged.

From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvwuj5tabyW910+N-B=5kFNAC7QNYoQ=0xi3roBjQvFFQ@mail.gmail.com
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

b8d85bb50511c901d48fc34ea8f0bb958042fbf0
diff --cc include/drm/drm_gem.h
index 7bd8e2bbbb36,189fd618ca65..b8efd836edef
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@@ -485,10 -485,9 +485,11 @@@ int drm_gem_dumb_map_offset(struct drm_
  
  void drm_gem_lru_init(struct drm_gem_lru *lru, struct mutex *lock);
  void drm_gem_lru_remove(struct drm_gem_object *obj);
+ void drm_gem_lru_move_tail_locked(struct drm_gem_lru *lru, struct drm_gem_object *obj);
  void drm_gem_lru_move_tail(struct drm_gem_lru *lru, struct drm_gem_object *obj);
 -unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, unsigned nr_to_scan,
 +unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru,
 +			       unsigned int nr_to_scan,
 +			       unsigned long *remaining,
  			       bool (*shrink)(struct drm_gem_object *obj));
  
  int drm_gem_evict(struct drm_gem_object *obj);