Commit 99290954 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-gt-next-2024-02-28' of... 

Merge tag 'drm-intel-gt-next-2024-02-28' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

Driver Changes:

Fixes:

- Add some boring kerneldoc (Tvrtko Ursulin)
- Check before removing mm notifier (Nirmoy

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Zd889Wvu/ZKZSK4/@tursulin-desk
parents ca7a1d0d db7bbd13

drivers/gpu/drm/i915/gem/i915_gem_userptr.c

+3 −0
Original line number Diff line number Diff line
@@ -349,6 +349,9 @@ i915_gem_userptr_release(struct drm_i915_gem_object *obj) 
{

	GEM_WARN_ON(obj->userptr.page_ref);



	if (!obj->userptr.notifier.mm)

		return;



	mmu_interval_notifier_remove(&obj->userptr.notifier);

	obj->userptr.notifier.mm = NULL;

}

include/uapi/drm/i915_drm.h

+4 −0
Original line number Diff line number Diff line
@@ -3572,9 +3572,13 @@ struct drm_i915_query_memory_regions { 
 * struct drm_i915_query_guc_submission_version - query GuC submission interface version

 */

struct drm_i915_query_guc_submission_version {

	/** @branch: Firmware branch version. */

	__u32 branch;

	/** @major: Firmware major version. */

	__u32 major;

	/** @minor: Firmware minor version. */

	__u32 minor;

	/** @patch: Firmware patch version. */

	__u32 patch;

};