[08/10] drm/i915/dsb: added dsb refcount to synchronize between get/put.

Submitted by Animesh Manna on Sept. 6, 2019, 6:21 p.m.

Details

Message ID 20190906182138.22818-8-animesh.manna@intel.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Intel GFX - Try Bot

Not browsing as part of any series.

Commit Message

Animesh Manna Sept. 6, 2019, 6:21 p.m.
Signed-off-by: Animesh Manna <animesh.manna@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dsb.c | 22 ++++++++++++++++------
 drivers/gpu/drm/i915/display/intel_dsb.h |  1 +
 2 files changed, 17 insertions(+), 6 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c
index 853685751540..b951a6b5264a 100644
--- a/drivers/gpu/drm/i915/display/intel_dsb.c
+++ b/drivers/gpu/drm/i915/display/intel_dsb.c
@@ -78,7 +78,12 @@  intel_dsb_get(struct intel_crtc *crtc)
 	struct intel_dsb *dsb = &crtc->dsb;
 	intel_wakeref_t wakeref;
 
-	if ((!HAS_DSB(i915)) || dsb->cmd_buf)
+	if (!HAS_DSB(i915))
+		return dsb;
+
+	atomic_inc(&dsb->refcount);
+
+	if (dsb->cmd_buf)
 		return dsb;
 
 	dsb->id = DSB1;
@@ -94,6 +99,7 @@  intel_dsb_get(struct intel_crtc *crtc)
 	if (IS_ERR(vma)) {
 		DRM_ERROR("Vma creation failed.\n");
 		i915_gem_object_put(obj);
+		atomic_dec(&dsb->refcount);
 		goto err;
 	}
 
@@ -102,6 +108,7 @@  intel_dsb_get(struct intel_crtc *crtc)
 		DRM_ERROR("Command buffer creation failed.\n");
 		i915_vma_unpin_and_release(&vma, 0);
 		dsb->cmd_buf = NULL;
+		atomic_dec(&dsb->refcount);
 		goto err;
 	}
 	dsb->vma = vma;
@@ -121,11 +128,14 @@  void intel_dsb_put(struct intel_dsb *dsb)
 		return;
 
 	if (dsb->cmd_buf) {
-		mutex_lock(&i915->drm.struct_mutex);
-		i915_gem_object_unpin_map(dsb->vma->obj);
-		i915_vma_unpin_and_release(&dsb->vma, 0);
-		dsb->cmd_buf = NULL;
-		mutex_unlock(&i915->drm.struct_mutex);
+		atomic_dec(&dsb->refcount);
+		if (!atomic_read(&dsb->refcount)) {
+			mutex_lock(&i915->drm.struct_mutex);
+			i915_gem_object_unpin_map(dsb->vma->obj);
+			i915_vma_unpin_and_release(&dsb->vma, 0);
+			dsb->cmd_buf = NULL;
+			mutex_unlock(&i915->drm.struct_mutex);
+		}
 	}
 }
 
diff --git a/drivers/gpu/drm/i915/display/intel_dsb.h b/drivers/gpu/drm/i915/display/intel_dsb.h
index 7389c8c5b665..dca4e632dd3c 100644
--- a/drivers/gpu/drm/i915/display/intel_dsb.h
+++ b/drivers/gpu/drm/i915/display/intel_dsb.h
@@ -20,6 +20,7 @@  enum dsb_id {
 };
 
 struct intel_dsb {
+	atomic_t refcount;
 	enum dsb_id id;
 	u32 *cmd_buf;
 	struct i915_vma *vma;