From: Dave Airlie <airlied@redhat.com>
Date: Fri, 3 Apr 2026 08:56:58 +0000 (+1000)
Subject: Merge tag 'drm-msm-next-2026-04-02' of https://gitlab.freedesktop.org/drm/msm into... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=512f9f150f367176fa9e5f4613b4863409a6f686;p=thirdparty%2Fkernel%2Flinux.git

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

Changes for v7.1

CI:
- Uprev mesa
- Restore CI jobs for Qualcomm APQ8016 and APQ8096 devices

Core:
- Switched to of_get_available_child_by_name()

DPU:
- Fixes for DSC panels
- Fixed brownout because of the frequency / OPP mismatch
- Quad pipe preparation (not enabled yet)
- Switched to virtual planes by default
- Dropped VBIF_NRT support
- Added support for Eliza platform
- Reworked alpha handling
- Switched to correct CWB definitions on Eliza
- Dropped dummy INTF_0 on MSM8953
- Corrected INTFs related to DP-MST

DP:
- Removed debug prints looking into PHY internals

DSI:
- Fixes for DSC panels
- RGB101010 support
- Support for SC8280XP
- Moved PHY bindings from display/ to phy/

GPU:
- Preemption support for x2-85 and a840
- IFPC support for a840
- SKU detection support for x2-85 and a840
- Expose AQE support (VK ray-pipeline)
- Avoid locking in VM_BIND fence signaling path
- Fix to avoid reclaim in GPU snapshot path
- Disallow foreign mapping of _NO_SHARE BOs
- Couple a6xx gpu snapshot fixes
- Various other fixes

HDMI:
- Fixed infoframes programming

MDP5:
- Dropped support for MSM8974v1
- Dropped now unused code for MSM8974 v1 and SDM660 / MSM8998

Also misc small fixes

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <rob.clark@oss.qualcomm.com>
Link: https://patch.msgid.link/CACSVV012vn73BaUfk=Hw4WkQHZNPHiqfifWEunAqMc2EGOWUEQ@mail.gmail.com
---

512f9f150f367176fa9e5f4613b4863409a6f686
diff --cc drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index ef9fd6171af71,d7ed3225f635a..79acae11154aa
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@@ -1732,9 -1731,10 +1730,10 @@@ static struct msm_gpu *a5xx_gpu_init(st
  	struct adreno_gpu *adreno_gpu;
  	struct msm_gpu *gpu;
  	unsigned int nr_rings;
+ 	u32 speedbin;
  	int ret;
  
 -	a5xx_gpu = kzalloc(sizeof(*a5xx_gpu), GFP_KERNEL);
 +	a5xx_gpu = kzalloc_obj(*a5xx_gpu);
  	if (!a5xx_gpu)
  		return ERR_PTR(-ENOMEM);
  
diff --cc drivers/gpu/drm/msm/msm_gem_vma.c
index adf88cf8f41aa,953a2403f5980..1a952b171ed7f
--- a/drivers/gpu/drm/msm/msm_gem_vma.c
+++ b/drivers/gpu/drm/msm/msm_gem_vma.c
@@@ -373,9 -373,15 +373,15 @@@ msm_gem_vma_new(struct drm_gpuvm *gpuvm
  	struct msm_gem_vma *vma;
  	int ret;
  
+ 	/* _NO_SHARE objs cannot be mapped outside of their "host" vm: */
+ 	if (obj && (to_msm_bo(obj)->flags & MSM_BO_NO_SHARE) &&
+ 	    GEM_WARN_ON(obj->resv != drm_gpuvm_resv(gpuvm))) {
+ 		return ERR_PTR(-EINVAL);
+ 	}
+ 
  	drm_gpuvm_resv_assert_held(&vm->base);
  
 -	vma = kzalloc(sizeof(*vma), GFP_KERNEL);
 +	vma = kzalloc_obj(*vma);
  	if (!vma)
  		return ERR_PTR(-ENOMEM);