Skip to content

Commit 9e66516

Browse files
LuizOt31rodrigovivi
authored andcommitted
drm/i915: Clean-up outdated struct_mutex comments
The struct_mutex will be removed from the DRM subsystem, as it was a legacy BKL that was only used by i915 driver. After review, it was concluded that its usage was no longer necessary This patch updates various comments in the i915 codebase to either remove or clarify references to struct_mutex, in order to prevent future misunderstandings. * i915_drv.h: Removed the statement that stolen_lock is the inner lock when overlaps with struct_mutex, since struct_mutex is no longer used in the driver. * i915_gem.c: Removed parentheses suggesting usage of struct_mutex, which which is no longer used. Signed-off-by: Luiz Otavio Mello <[email protected]> Reviewed-by: Rodrigo Vivi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent 5be4fa9 commit 9e66516

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ struct i915_gem_mm {
116116
struct intel_memory_region *stolen_region;
117117
/** Memory allocator for GTT stolen memory */
118118
struct drm_mm stolen;
119-
/** Protects the usage of the GTT stolen memory allocator. This is
120-
* always the inner lock when overlapping with struct_mutex. */
119+
/** Protects the usage of the GTT stolen memory allocator */
121120
struct mutex stolen_lock;
122121

123122
/* Protects bound_list/unbound_list and #drm_i915_gem_object.mm.link */

drivers/gpu/drm/i915/i915_gem.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,7 @@ void i915_gem_runtime_suspend(struct drm_i915_private *i915)
847847
/*
848848
* Only called during RPM suspend. All users of the userfault_list
849849
* must be holding an RPM wakeref to ensure that this can not
850-
* run concurrently with themselves (and use the struct_mutex for
851-
* protection between themselves).
850+
* run concurrently with themselves.
852851
*/
853852

854853
list_for_each_entry_safe(obj, on,

0 commit comments

Comments
 (0)