From: Dave Airlie <airlied@redhat.com>
Date: Mon, 8 Jun 2026 09:56:59 +0000 (+1000)
Subject: Merge tag 'amd-drm-next-7.2-2026-06-04' of https://gitlab.freedesktop.org/agd5f/linux... 
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5ea194bc25518376dee1209e64d32f940dd0cc4c;p=thirdparty%2Flinux.git

Merge tag 'amd-drm-next-7.2-2026-06-04' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-7.2-2026-06-04:

amdgpu:
- UserQ fix
- Userptr fix
- MCCS freesync fix
- Remove some triggerable BUG() calls
- DCN 4.2.1 fixes
- Lockdep annotations
- Guilty handling fix
- VCN 5.3 fix
- FRL fixes
- Bounds checking fixes
- HMM fix
- IRQ accounting fix

amdkfd:
- Fix an event information leak
- Events bounds check fix
- Trap cleanup fix
- Bounds checking fixes
- MES fix

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20260604231801.19979-1-alexander.deucher@amd.com
---

5ea194bc25518376dee1209e64d32f940dd0cc4c
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 6ada57abce9d4,fc071efd4c255..115b134b4cd13
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@@ -1277,8 -1274,10 +1272,9 @@@ static int amdgpu_cs_submit(struct amdg
  {
  	struct amdgpu_fpriv *fpriv = p->filp->driver_priv;
  	struct amdgpu_job *leader = p->gang_leader;
+ 	struct amdgpu_vm *vm = &fpriv->vm;
  	struct amdgpu_bo_list_entry *e;
  	struct drm_gem_object *gobj;
 -	unsigned long index;
  	unsigned int i;
  	uint64_t seq;
  	int r;