From: Ville Syrjälä Date: Fri, 19 Sep 2025 18:50:13 +0000 (+0300) Subject: drm/i915/pm: Do pci_restore_state() in switcheroo resume hook X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03a37f5c3a169bea3c25b1e07e632cd0ddbcf302;p=thirdparty%2Fkernel%2Flinux.git drm/i915/pm: Do pci_restore_state() in switcheroo resume hook Since this switcheroo garbage bypasses all the core pm we have to manually manage the pci state. To that end add the missing pci_restore_state() to the switcheroo resume hook. We already have the pci_save_state() counterpart on the suspend side. Arguably none of this code should exist in the driver in the first place, and instead the entire switcheroo mechanism should be rewritten and properly integrated into core pm code... Reviewed-by: Rodrigo Vivi Reviewed-by: Jouni Högander Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20250919185015.14561-5-ville.syrjala@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 327e5fe7dfffc..009f4e27cf49b 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -1346,6 +1346,8 @@ int i915_driver_resume_switcheroo(struct drm_i915_private *i915) if (ret) return ret; + pci_restore_state(pdev); + ret = i915_drm_resume_early(&i915->drm); if (ret) return ret;