]> git.dujemihanovic.xyz Git - linux.git/commitdiff
drm/xe: Fix missing conversion to xe_display_pm_runtime_resume
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 5 Sep 2024 15:00:49 +0000 (17:00 +0200)
committerLucas De Marchi <lucas.demarchi@intel.com>
Thu, 12 Sep 2024 23:04:36 +0000 (18:04 -0500)
This error path was missed when converting away from
xe_display_pm_resume with second argument.

Fixes: 66a0f6b9f5fc ("drm/xe/display: handle HPD polling in display runtime suspend/resume")
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Cc: Vinod Govindapillai <vinod.govindapillai@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240905150052.174895-2-maarten.lankhorst@linux.intel.com
(cherry picked from commit 474f64cb988a410db8a0b779d6afdaa2a7fc5759)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/xe_pm.c

index a3d1509066f78ba8f50f2e14afaa57f73367a018..7cf2160fe0408d2001e3ea810ab44dcdeff99200 100644 (file)
@@ -416,7 +416,7 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
                xe_display_pm_suspend_late(xe);
 out:
        if (err)
-               xe_display_pm_resume(xe, true);
+               xe_display_pm_runtime_resume(xe);
        xe_rpm_lockmap_release(xe);
        xe_pm_write_callback_task(xe, NULL);
        return err;