Commit 5c75d681 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes 



- Fix UAF on rebind worker
- Fix ADL-N display integration

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

From: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6bontwst3mbxozs6u3ad5n3g5zmaucrngbfwv4hkfhpscnwlym@wlwjgjx6pwue
parents 306eca05 df04b152

drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev) 
#define IS_ROCKETLAKE(dev_priv)	IS_PLATFORM(dev_priv, XE_ROCKETLAKE)

#define IS_DG1(dev_priv)        IS_PLATFORM(dev_priv, XE_DG1)

#define IS_ALDERLAKE_S(dev_priv) IS_PLATFORM(dev_priv, XE_ALDERLAKE_S)

#define IS_ALDERLAKE_P(dev_priv) IS_PLATFORM(dev_priv, XE_ALDERLAKE_P)

#define IS_ALDERLAKE_P(dev_priv) (IS_PLATFORM(dev_priv, XE_ALDERLAKE_P) || \

				  IS_PLATFORM(dev_priv, XE_ALDERLAKE_N))

#define IS_XEHPSDV(dev_priv) (dev_priv && 0)

#define IS_DG2(dev_priv)	IS_PLATFORM(dev_priv, XE_DG2)

#define IS_PONTEVECCHIO(dev_priv) IS_PLATFORM(dev_priv, XE_PVC)

drivers/gpu/drm/xe/xe_vm.c

+3 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,9 @@ static void vm_destroy_work_func(struct work_struct *w) 
	/* xe_vm_close_and_put was not called? */

	xe_assert(xe, !vm->size);



	if (xe_vm_in_preempt_fence_mode(vm))

		flush_work(&vm->preempt.rebind_work);



	mutex_destroy(&vm->snap_mutex);



	if (!(vm->flags & XE_VM_FLAG_MIGRATION))