Skip to contentSkip to conversation

drm: Add missing mutex_destroy in drm_dev_init

PATCH Superseded Joonas Lahtinen 3 participants 7 messages Nov 10, 2016 – Nov 14, 2016

Subsystems (3)
lore
Share & tools
lore

Joonas Lahtinen

author maintainer
#0 lore raw

PATCH 1/2 drm: Add missing mutex_destroy in drm_dev_init

Add 3 missing mutex_destroy to drm_dev_init teardown.

---
 drivers/gpu/drm/drm_drv.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_drv.c +3 -0
index 6efdba4..ba144b3 100644
@@ -568,6 +568,9 @@ int drm_dev_init(struct drm_device *dev,
 	drm_fs_inode_free(dev->anon_inode);
 err_free:
 	mutex_destroy(&dev->master_mutex);
+	mutex_destroy(&dev->ctxlist_mutex);
+	mutex_destroy(&dev->filelist_mutex);
+	mutex_destroy(&dev->struct_mutex);
 	return ret;
 }
 EXPORT_SYMBOL(drm_dev_init);
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#1 lore raw

PATCH 2/2 drm/i915: Update i915_driver_load kerneldoc

Update i915_driver_load kerneldoc to match code.

---
 drivers/gpu/drm/i915/i915_drv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -2
index 9e5a547..d023c1a 100644
@@ -1168,8 +1168,8 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
 
 /**
  * i915_driver_load - setup chip and create an initial config
- * @dev: DRM device
- * @flags: startup flags
+ * @pdev: PCI device
+ * @ent: matching PCI ID entry
  *
  * The driver load routine has to do several things:
  *   - drive output discovery via intel_modeset_init()
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] drm/i915: Update i915_driver_load kerneldoc

Quoted 4 lines · Joonas Lahtinen

Update i915_driver_load kerneldoc to match code.

-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author maintainer
#3 lore raw

PATCH v2 1/1 drm: Add missing mutex_destroy in drm_dev_init/release

In reply to Joonas Lahtinen

Add 3 missing mutex_destroy to drm_dev_init teardown and drm_dev_release.

v2:
- Also include drm_dev_release

---
 drivers/gpu/drm/drm_drv.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_drv.c +6 -0
index 6efdba4..d1cb739 100644
@@ -568,6 +568,9 @@ int drm_dev_init(struct drm_device *dev,
 	drm_fs_inode_free(dev->anon_inode);
 err_free:
 	mutex_destroy(&dev->master_mutex);
+	mutex_destroy(&dev->ctxlist_mutex);
+	mutex_destroy(&dev->filelist_mutex);
+	mutex_destroy(&dev->struct_mutex);
 	return ret;
 }
 EXPORT_SYMBOL(drm_dev_init);
@@ -630,6 +633,9 @@ static void drm_dev_release(struct kref *ref)
 	drm_minor_free(dev, DRM_MINOR_CONTROL);
 
 	mutex_destroy(&dev->master_mutex);
+	mutex_destroy(&dev->ctxlist_mutex);
+	mutex_destroy(&dev->filelist_mutex);
+	mutex_destroy(&dev->struct_mutex);
 	kfree(dev->unique);
 	kfree(dev);
 }
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v2 1/1
#4 lore raw

Re: [PATCH v2] drm: Add missing mutex_destroy in drm_dev_init/release

Quoted 7 lines · Joonas Lahtinen

Add 3 missing mutex_destroy to drm_dev_init teardown and drm_dev_release.

v2:
- Also include drm_dev_release

-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

✓ Fi.CI.BAT: success for series starting with [v2] drm: Add missing mutex_destroy in drm_dev_init/release (rev2)

In reply to Joonas Lahtinen
== Series Details ==

== Series Details ==

Series: series starting with [v2] drm: Add missing mutex_destroy in drm_dev_init/release (rev2)
URL : https://patchwork.freedesktop.org/series/15110/
State : success

== Summary ==

Series 15110v2 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/15110/revisions/2/mbox/

fi-bdw-5557u     total:244  pass:229  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:244  pass:204  dwarn:0   dfail:0   fail:0   skip:40 
fi-bxt-t5700     total:244  pass:216  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-j1900     total:244  pass:216  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-n2820     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-hsw-4770      total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:244  pass:224  dwarn:0   dfail:0   fail:0   skip:20 
fi-ilk-650       total:244  pass:191  dwarn:0   dfail:0   fail:0   skip:53 
fi-ivb-3520m     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-ivb-3770      total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-kbl-7200u     total:244  pass:222  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6260u     total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:244  pass:223  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6700k     total:244  pass:222  dwarn:1   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:244  pass:230  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:244  pass:212  dwarn:0   dfail:0   fail:0   skip:32 
fi-snb-2600      total:244  pass:211  dwarn:0   dfail:0   fail:0   skip:33 

eb88955cdc6a1f4dabff6bc27747c1c9e9a3aaef drm-intel-nightly: 2016y-11m-10d-09h-29m-41s UTC integration manifest e4c309e drm/i915: Update i915_driver_load kerneldoc
b6023a9 drm: Add missing mutex_destroy in drm_dev_init/release

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2955/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author maintainer
#6 lore raw

Re: ✓ Fi.CI.BAT: success for series starting with [v2] drm: Add missing mutex_destroy in drm_dev_init/release (rev2)

Quoted 5 lines · Patchwork

== Series Details ==

Series: series starting with [v2] drm: Add missing mutex_destroy in drm_dev_init/release (rev2) URL   : https://patchwork.freedesktop.org/series/15110/
State : success

Daniel applied the other patch and I the second, thanks for review.

Regards, Joonas

Signature · 7 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx