Re: [Intel-gfx] [PATCH] drm/i915/guc: Don't take struct_mutex for object unreference

[Joonas Lahtinen]

On ti, 2017-02-14 at 13:34 +, Chris Wilson wrote:
> We no longer need to take the struct_mutex for freeing objects, and on
> the finalisation paths here the mutex is not been used for serialisation
> of the pointer access, so remove the BKL wart.
> 
> Signed-off-by: Chris Wilson 

Reviewed-by: Joonas Lahtinen 

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915/guc: Don't take struct_mutex for object unreference

[Chris Wilson]

We no longer need to take the struct_mutex for freeing objects, and on
the finalisation paths here the mutex is not been used for serialisation
of the pointer access, so remove the BKL wart.

Signed-off-by: Chris Wilson 
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 14 ++
 drivers/gpu/drm/i915/intel_huc.c|  9 -
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c 
b/drivers/gpu/drm/i915/intel_guc_loader.c
index 8ef33d88d5a0..9885f760f2ef 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -714,12 +714,9 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
DRM_DEBUG_DRIVER("uC fw fetch status FAIL; err %d, fw %p, obj %p\n",
err, fw, uc_fw->obj);
 
-   mutex_lock(_priv->drm.struct_mutex);
-   obj = uc_fw->obj;
+   obj = fetch_and_zero(_fw->obj);
if (obj)
i915_gem_object_put(obj);
-   uc_fw->obj = NULL;
-   mutex_unlock(_priv->drm.struct_mutex);
 
release_firmware(fw);   /* OK even if fw is NULL */
uc_fw->fetch_status = INTEL_UC_FIRMWARE_FAIL;
@@ -793,16 +790,17 @@ void intel_guc_init(struct drm_i915_private *dev_priv)
 void intel_guc_fini(struct drm_i915_private *dev_priv)
 {
struct intel_uc_fw *guc_fw = _priv->guc.fw;
+   struct drm_i915_gem_object *obj;
 
mutex_lock(_priv->drm.struct_mutex);
guc_interrupts_release(dev_priv);
i915_guc_submission_disable(dev_priv);
i915_guc_submission_fini(dev_priv);
-
-   if (guc_fw->obj)
-   i915_gem_object_put(guc_fw->obj);
-   guc_fw->obj = NULL;
mutex_unlock(_priv->drm.struct_mutex);
 
+   obj = fetch_and_zero(_fw->obj);
+   if (obj)
+   i915_gem_object_put(obj);
+
guc_fw->fetch_status = INTEL_UC_FIRMWARE_NONE;
 }
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index c144609425f6..c28543d220a2 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -274,12 +274,11 @@ int intel_huc_load(struct drm_i915_private *dev_priv)
 void intel_huc_fini(struct drm_i915_private *dev_priv)
 {
struct intel_uc_fw *huc_fw = _priv->huc.fw;
+   struct drm_i915_gem_object *obj;
 
-   mutex_lock(_priv->drm.struct_mutex);
-   if (huc_fw->obj)
-   i915_gem_object_put(huc_fw->obj);
-   huc_fw->obj = NULL;
-   mutex_unlock(_priv->drm.struct_mutex);
+   obj = fetch_and_zero(_fw->obj);
+   if (obj)
+   i915_gem_object_put(obj);
 
huc_fw->fetch_status = INTEL_UC_FIRMWARE_NONE;
 }
-- 
2.11.0

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915/guc: Don't take struct_mutex for object unreference

[Chris Wilson]

We no longer need to take the struct_mutex for freeing objects, and on
the finalisation paths here the mutex is not been used for serialisation
of the pointer access, so remove the BKL wart.

Signed-off-by: Chris Wilson 
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c 
b/drivers/gpu/drm/i915/intel_guc_loader.c
index 1aa85236b788..77a5c27b9da0 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -699,12 +699,9 @@ static void guc_fw_fetch(struct drm_device *dev, struct 
intel_guc_fw *guc_fw)
DRM_DEBUG_DRIVER("GuC fw fetch status FAIL; err %d, fw %p, obj %p\n",
err, fw, guc_fw->guc_fw_obj);
 
-   mutex_lock(>struct_mutex);
-   obj = guc_fw->guc_fw_obj;
+   obj = fetch_and_zero(_fw->guc_fw_obj);
if (obj)
i915_gem_object_put(obj);
-   guc_fw->guc_fw_obj = NULL;
-   mutex_unlock(>struct_mutex);
 
release_firmware(fw);   /* OK even if fw is NULL */
guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_FAIL;
@@ -781,16 +778,17 @@ void intel_guc_fini(struct drm_device *dev)
 {
struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_guc_fw *guc_fw = _priv->guc.guc_fw;
+   struct drm_i915_gem_object *obj;
 
mutex_lock(>struct_mutex);
guc_interrupts_release(dev_priv);
i915_guc_submission_disable(dev_priv);
i915_guc_submission_fini(dev_priv);
-
-   if (guc_fw->guc_fw_obj)
-   i915_gem_object_put(guc_fw->guc_fw_obj);
-   guc_fw->guc_fw_obj = NULL;
mutex_unlock(>struct_mutex);
 
+   obj = fetch_and_zero(_fw->guc_fw_obj);
+   if (obj)
+   i915_gem_object_put(obj);
+
guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_NONE;
 }
-- 
2.10.2

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx