Skip to content

Commit 34ac58d

Browse files
LuizOt31rodrigovivi
authored andcommitted
drm/i915: Drop unused struct_mutex from drm_i915_private
The struct_mutex field in drm_i915_private is no longer used anywhere in the driver. This patch removes it completely to clean up unused code and avoid confusion. 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 9e66516 commit 34ac58d

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

drivers/gpu/drm/i915/i915_driver.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ static int i915_driver_early_probe(struct drm_i915_private *dev_priv)
235235

236236
intel_sbi_init(display);
237237
vlv_iosf_sb_init(dev_priv);
238-
mutex_init(&dev_priv->struct_mutex);
239238
mutex_init(&dev_priv->sb_lock);
240239

241240
i915_memcpy_init_early(dev_priv);
@@ -294,7 +293,6 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv)
294293
i915_workqueues_cleanup(dev_priv);
295294

296295
mutex_destroy(&dev_priv->sb_lock);
297-
mutex_destroy(&dev_priv->struct_mutex);
298296
vlv_iosf_sb_fini(dev_priv);
299297
intel_sbi_fini(display);
300298

drivers/gpu/drm/i915/i915_drv.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,6 @@ struct drm_i915_private {
223223

224224
bool irqs_enabled;
225225

226-
/*
227-
* Currently, struct_mutex is only used by the i915 driver as a replacement
228-
* for BKL.
229-
*
230-
* For this reason, it is no longer part of struct drm_device.
231-
*/
232-
struct mutex struct_mutex;
233-
234226
/* LPT/WPT IOSF sideband protection */
235227
struct mutex sbi_lock;
236228

0 commit comments

Comments
 (0)