Skip to content

Commit 9929095

Browse files
committed
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: Dave Airlie <airlied@redhat.com> From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/Zd889Wvu/ZKZSK4/@tursulin-desk
2 parents ca7a1d0 + db7bbd1 commit 9929095

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,9 @@ i915_gem_userptr_release(struct drm_i915_gem_object *obj)
349349
{
350350
GEM_WARN_ON(obj->userptr.page_ref);
351351

352+
if (!obj->userptr.notifier.mm)
353+
return;
354+
352355
mmu_interval_notifier_remove(&obj->userptr.notifier);
353356
obj->userptr.notifier.mm = NULL;
354357
}

include/uapi/drm/i915_drm.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3572,9 +3572,13 @@ struct drm_i915_query_memory_regions {
35723572
* struct drm_i915_query_guc_submission_version - query GuC submission interface version
35733573
*/
35743574
struct drm_i915_query_guc_submission_version {
3575+
/** @branch: Firmware branch version. */
35753576
__u32 branch;
3577+
/** @major: Firmware major version. */
35763578
__u32 major;
3579+
/** @minor: Firmware minor version. */
35773580
__u32 minor;
3581+
/** @patch: Firmware patch version. */
35783582
__u32 patch;
35793583
};
35803584

0 commit comments

Comments
 (0)