]> git.dujemihanovic.xyz Git - linux.git/commitdiff
drm/xe: Remove useless mem_access protection for query ioctls
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 22 Feb 2024 16:39:33 +0000 (11:39 -0500)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 26 Feb 2024 14:06:45 +0000 (09:06 -0500)
Every IOCTL is already protected on its outer bounds by
xe_pm_runtime_{get,put} calls, so we can now remove
these.

Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240222163937.138342-10-rodrigo.vivi@intel.com
drivers/gpu/drm/xe/xe_query.c

index 92bb06c0586eb47268f826ba15ce24c5c3031d42..f1876b556ab48008a4656dee738c657b85b8b93b 100644 (file)
@@ -147,7 +147,6 @@ query_engine_cycles(struct xe_device *xe,
        if (!hwe)
                return -EINVAL;
 
-       xe_device_mem_access_get(xe);
        xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
 
        __read_timestamps(gt,
@@ -159,7 +158,6 @@ query_engine_cycles(struct xe_device *xe,
                          cpu_clock);
 
        xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);
-       xe_device_mem_access_put(xe);
        resp.width = 36;
 
        /* Only write to the output fields of user query */
@@ -433,9 +431,7 @@ static int query_hwconfig(struct xe_device *xe,
        if (!hwconfig)
                return -ENOMEM;
 
-       xe_device_mem_access_get(xe);
        xe_guc_hwconfig_copy(&gt->uc.guc, hwconfig);
-       xe_device_mem_access_put(xe);
 
        if (copy_to_user(query_ptr, hwconfig, size)) {
                kfree(hwconfig);