]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/xe/oa: Fix "Missing outer runtime PM protection" warning
authorAshutosh Dixit <ashutosh.dixit@intel.com>
Sat, 9 Nov 2024 03:20:03 +0000 (19:20 -0800)
committerLucas De Marchi <lucas.demarchi@intel.com>
Wed, 13 Nov 2024 19:37:22 +0000 (11:37 -0800)
Fix the following drm_WARN:

[953.586396] xe 0000:00:02.0: [drm] Missing outer runtime PM protection
...
<4> [953.587090]  ? xe_pm_runtime_get_noresume+0x8d/0xa0 [xe]
<4> [953.587208]  guc_exec_queue_add_msg+0x28/0x130 [xe]
<4> [953.587319]  guc_exec_queue_fini+0x3a/0x40 [xe]
<4> [953.587425]  xe_exec_queue_destroy+0xb3/0xf0 [xe]
<4> [953.587515]  xe_oa_release+0x9c/0xc0 [xe]

Suggested-by: John Harrison <john.c.harrison@intel.com>
Suggested-by: Matthew Brost <matthew.brost@intel.com>
Fixes: e936f885f1e9 ("drm/xe/oa/uapi: Expose OA stream fd")
Cc: stable@vger.kernel.org
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241109032003.3093811-1-ashutosh.dixit@intel.com
(cherry picked from commit b107c63d2953907908fd0cafb0e543b3c3167b75)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/xe_oa.c

index 2804f14f8f2979d9b6ec0309a2a6a5ad86d2c9f0..78823f53d2905da05a65cb51cbd737bed3724e9a 100644 (file)
@@ -1206,9 +1206,11 @@ static int xe_oa_release(struct inode *inode, struct file *file)
        struct xe_oa_stream *stream = file->private_data;
        struct xe_gt *gt = stream->gt;
 
+       xe_pm_runtime_get(gt_to_xe(gt));
        mutex_lock(&gt->oa.gt_lock);
        xe_oa_destroy_locked(stream);
        mutex_unlock(&gt->oa.gt_lock);
+       xe_pm_runtime_put(gt_to_xe(gt));
 
        /* Release the reference the OA stream kept on the driver */
        drm_dev_put(&gt_to_xe(gt)->drm);