On Thu, Aug 07, 2025 at 02:02:06PM -0300, Luiz Otavio Mello wrote:
> 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 <luiz.me...@estudante.ufscar.br>
Reviewed-by: Rodrigo Vivi <rodrigo.v...@intel.com>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 3 +--
> drivers/gpu/drm/i915/i915_gem.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 6093dbaf4009..e8cb94962482 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -114,8 +114,7 @@ struct i915_gem_mm {
> struct intel_memory_region *stolen_region;
> /** Memory allocator for GTT stolen memory */
> struct drm_mm stolen;
> - /** Protects the usage of the GTT stolen memory allocator. This is
> - * always the inner lock when overlapping with struct_mutex. */
> + /** Protects the usage of the GTT stolen memory allocator */
> struct mutex stolen_lock;
>
> /* Protects bound_list/unbound_list and #drm_i915_gem_object.mm.link */
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 8c8d43451f35..e14a0c3db999 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -847,8 +847,7 @@ void i915_gem_runtime_suspend(struct drm_i915_private
> *i915)
> /*
> * Only called during RPM suspend. All users of the userfault_list
> * must be holding an RPM wakeref to ensure that this can not
> - * run concurrently with themselves (and use the struct_mutex for
> - * protection between themselves).
> + * run concurrently with themselves.
> */
>
> list_for_each_entry_safe(obj, on,
> --
> 2.50.1
>
