On Tue, Mar 11, 2025 at 09:56:22PM +0200, Ville Syrjala wrote: 61;7802;1c> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > 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 <rodrigo.vivi@xxxxxxxxx> > > Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_driver.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index 995205e24ebf..a199e21c7bb4 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -1340,6 +1340,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; > -- > 2.45.3 >
