[PATCH 19/24] drm/xe/eudebug: Allow getting eudebug instance during discovery

[Mika Kuoppala <mika.kuoppala@linux.intel.com>]

From: Maciej Patelczyk <maciej.patelczyk@intel.com>

Allow to get eudebug instance even if discovery has not yet finished.

This is needed for internal queuing pagefault events if discovery is
running.

Signed-off-by: Maciej Patelczyk <maciej.patelczyk@intel.com>
Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 drivers/gpu/drm/xe/xe_eudebug.c | 35 +++++++++++++++++++++++++++++----
 drivers/gpu/drm/xe/xe_eudebug.h |  2 ++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_eudebug.c b/drivers/gpu/drm/xe/xe_eudebug.c
index 4e9977d33612..3f22924a1275 100644
--- a/drivers/gpu/drm/xe/xe_eudebug.c
+++ b/drivers/gpu/drm/xe/xe_eudebug.c
@@ -467,7 +467,7 @@ static int _xe_eudebug_disconnect(struct xe_eudebug *d,
 })
 
 static struct xe_eudebug *
-xe_eudebug_get_nolock(struct xe_file *xef)
+__xe_eudebug_get(struct xe_file *xef)
 {
 	struct xe_eudebug *d;
 
@@ -480,8 +480,22 @@ xe_eudebug_get_nolock(struct xe_file *xef)
 	if (!d)
 		return NULL;
 
-	if (xe_eudebug_detached(d) ||
-	    !completion_done(&d->discovery)) {
+	if (xe_eudebug_detached(d)) {
+		xe_eudebug_put(d);
+		return NULL;
+	}
+
+	return d;
+}
+
+static struct xe_eudebug *
+_xe_eudebug_get(struct xe_file *xef)
+{
+	struct xe_eudebug *d;
+
+	d = __xe_eudebug_get(xef);
+
+	if (d && !completion_done(&d->discovery)) {
 		xe_eudebug_put(d);
 		return NULL;
 	}
@@ -494,7 +508,20 @@ xe_eudebug_get(struct xe_file *xef)
 {
 	lockdep_assert_held(&xef->eudebug.ioctl_lock);
 
-	return xe_eudebug_get_nolock(xef);
+	return _xe_eudebug_get(xef);
+}
+
+struct xe_eudebug *
+xe_eudebug_get_nolock(struct xe_file *xef)
+{
+	return _xe_eudebug_get(xef);
+}
+
+/* Returns eudebug instance even if discovery is running */
+struct xe_eudebug *
+xe_eudebug_get_nolock_with_discovery(struct xe_file *xef)
+{
+	return __xe_eudebug_get(xef);
 }
 
 static int xe_eudebug_queue_event(struct xe_eudebug *d,
diff --git a/drivers/gpu/drm/xe/xe_eudebug.h b/drivers/gpu/drm/xe/xe_eudebug.h
index bd9fd7bf454f..b1f8a5fcc890 100644
--- a/drivers/gpu/drm/xe/xe_eudebug.h
+++ b/drivers/gpu/drm/xe/xe_eudebug.h
@@ -72,6 +72,8 @@ void xe_eudebug_ufence_init(struct xe_user_fence *ufence);
 void xe_eudebug_ufence_fini(struct xe_user_fence *ufence);
 bool xe_eudebug_ufence_track(struct xe_user_fence *ufence);
 
+struct xe_eudebug *xe_eudebug_get_nolock(struct xe_file *xef);
+struct xe_eudebug *xe_eudebug_get_nolock_with_discovery(struct xe_file *xef);
 void xe_eudebug_put(struct xe_eudebug *d);
 
 #else
-- 
2.43.0