]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe: Restore pci state upon resume
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Thu, 12 Sep 2024 21:45:07 +0000 (17:45 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Oct 2024 10:00:11 +0000 (12:00 +0200)
[ Upstream commit cffa8e83df9fe525afad1e1099097413f9174f57 ]

The pci state was saved, but not restored. Restore
right after the power state transition request like
every other driver.

v2: Use right fixes tag, since this was there initialy, but
    accidentally removed.

Fixes: f6761c68c0ac ("drm/xe/display: Improve s2idle handling.")
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240912214507.456897-1-rodrigo.vivi@intel.com
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
(cherry picked from commit ec2d1539e159f53eae708e194c449cfefa004994)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/xe/xe_pci.c

index f326dbb1cecd9f6729ed4cc0c47ec694999a9887..99824e19a376f2aa92eddb016f042e7f16abec07 100644 (file)
@@ -868,6 +868,8 @@ static int xe_pci_resume(struct device *dev)
        if (err)
                return err;
 
+       pci_restore_state(pdev);
+
        err = pci_enable_device(pdev);
        if (err)
                return err;