[PATCH v5 7/8] drm/xe: Handle xe_work_period destruction

[Aakash Deep Sarkar <aakash.deep.sarkar@intel.com>]

This patch adds the xe_work_period destruction procedure.
We iterate over all entries in the xe::work_period::users
xarray and cancel any pending delayed work. Then destroy
the xarray itself.

Signed-off-by: Aakash Deep Sarkar <aakash.deep.sarkar@intel.com>
---
 drivers/gpu/drm/xe/xe_device.c |  2 ++
 drivers/gpu/drm/xe/xe_user.c   | 10 +++++++---
 drivers/gpu/drm/xe/xe_user.h   |  6 ++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
index 61ba76144721..1436a10244c5 100644
--- a/drivers/gpu/drm/xe/xe_device.c
+++ b/drivers/gpu/drm/xe/xe_device.c
@@ -434,6 +434,8 @@ static void xe_device_destroy(struct drm_device *dev, void *dummy)
 	if (xe->destroy_wq)
 		destroy_workqueue(xe->destroy_wq);
 
+	xe_user_fini(xe);
+
 	ttm_device_fini(&xe->ttm);
 }
 
diff --git a/drivers/gpu/drm/xe/xe_user.c b/drivers/gpu/drm/xe/xe_user.c
index fb54d2659642..90664c36e221 100644
--- a/drivers/gpu/drm/xe/xe_user.c
+++ b/drivers/gpu/drm/xe/xe_user.c
@@ -250,6 +250,12 @@ int xe_user_init(struct xe_device *xe, struct xe_file *xef, unsigned int uid)
 	return 0;
 }
 
+void xe_user_fini(struct xe_device *xe)
+{
+	xe_user_cancel_workers(xe);
+	xa_destroy(&xe->work_period.users);
+}
+
 void xe_user_cancel_workers(struct xe_device *xe)
 {
 	struct xe_user *user = NULL;
@@ -257,10 +263,8 @@ void xe_user_cancel_workers(struct xe_device *xe)
 
 	mutex_lock(&xe->work_period.lock);
 	xa_for_each(&xe->work_period.users, i, user) {
-		if (user && xe_user_get_unless_zero(user)) {
-			cancel_delayed_work_sync(&user->delay_work);
+		if (cancel_delayed_work_sync(&user->delay_work))
 			xe_user_put(user);
-		}
 	}
 	mutex_unlock(&xe->work_period.lock);
 }
diff --git a/drivers/gpu/drm/xe/xe_user.h b/drivers/gpu/drm/xe/xe_user.h
index 0d184464687c..d7ac58cb3db8 100644
--- a/drivers/gpu/drm/xe/xe_user.h
+++ b/drivers/gpu/drm/xe/xe_user.h
@@ -72,6 +72,8 @@ struct xe_user {
 
 int xe_user_init(struct xe_device *xe, struct xe_file *xef, unsigned int uid);
 
+void xe_user_fini(struct xe_device *xe);
+
 void xe_user_cancel_workers(struct xe_device *xe);
 
 void xe_user_resume_workers(struct xe_device *xe);
@@ -86,6 +88,10 @@ int xe_user_init(struct xe_device *xe, struct xe_file *xef, unsigned int uid)
 	return 0;
 }
 
+static inline void xe_user_fini(struct xe_device *xe)
+{
+}
+
 static inline void __xe_user_free(struct kref *kref)
 {
 }
-- 
2.49.0