| Message ID | 20240924204222.246862-13-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Reconcile i915's and xe's display power mgt sequences | expand |
> -----Original Message----- > From: Vivi, Rodrigo <rodrigo.vivi@intel.com> > Sent: Wednesday, September 25, 2024 2:06 AM > To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org > Cc: Deak, Imre <imre.deak@intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>; > Gupta, Anshuman <anshuman.gupta@intel.com>; Ville Syrjälä > <ville.syrjala@linux.intel.com> > Subject: [PATCH 12/31] drm/i915: Remove lingering pci_save_state > > The pairing pci_restore_state was removed by commit 'b7e53aba2f0e > ("drm/i915: remove restore in resume")' > to fix a hardware hang in resume. > > Furthermore, it looks like PCI subsystem should be taking care of the save and > restore here. > > Remove the lingering/stand-alone pci_save_state call. > > Cc: Anshuman Gupta <anshuman.gupta@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/i915_driver.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_driver.c > b/drivers/gpu/drm/i915/i915_driver.c > index ce2dd03136d3..4fc9d8bce1fd 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -1008,8 +1008,6 @@ static int i915_drm_suspend(struct drm_device *dev) > intel_display_driver_disable_user_access(dev_priv); > } > > - pci_save_state(pdev); Looks good to me! Reviewed-by: Anshuman Gupta <anshuman.gupta@intel.com> > - > intel_display_driver_suspend(dev_priv); > > intel_irq_suspend(dev_priv); > -- > 2.46.0
-----Original Message----- From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Rodrigo Vivi Sent: Tuesday, September 24, 2024 1:36 PM To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org Cc: Deak, Imre <imre.deak@intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>; Gupta, Anshuman <anshuman.gupta@intel.com>; Ville Syrjälä <ville.syrjala@linux.intel.com> Subject: [PATCH 12/31] drm/i915: Remove lingering pci_save_state > > The pairing pci_restore_state was removed by commit > 'b7e53aba2f0e ("drm/i915: remove restore in resume")' > to fix a hardware hang in resume. > > Furthermore, it looks like PCI subsystem should be taking care > of the save and restore here. > > Remove the lingering/stand-alone pci_save_state call. > > Cc: Anshuman Gupta <anshuman.gupta@intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> LGTM. Though the wording of the commit message may initially confuse some people (me) into thinking pci_save_state is now unused and can have its definition removed, which is not the case. I can't think of any better alternatives, though, so I won't block on it. Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> -Jonathan Cavitt Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com> > --- > drivers/gpu/drm/i915/i915_driver.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index ce2dd03136d3..4fc9d8bce1fd 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -1008,8 +1008,6 @@ static int i915_drm_suspend(struct drm_device *dev) > intel_display_driver_disable_user_access(dev_priv); > } > > - pci_save_state(pdev); > - > intel_display_driver_suspend(dev_priv); > > intel_irq_suspend(dev_priv); > -- > 2.46.0 > >
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index ce2dd03136d3..4fc9d8bce1fd 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -1008,8 +1008,6 @@ static int i915_drm_suspend(struct drm_device *dev) intel_display_driver_disable_user_access(dev_priv); } - pci_save_state(pdev); - intel_display_driver_suspend(dev_priv); intel_irq_suspend(dev_priv);
The pairing pci_restore_state was removed by commit 'b7e53aba2f0e ("drm/i915: remove restore in resume")' to fix a hardware hang in resume. Furthermore, it looks like PCI subsystem should be taking care of the save and restore here. Remove the lingering/stand-alone pci_save_state call. Cc: Anshuman Gupta <anshuman.gupta@intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> --- drivers/gpu/drm/i915/i915_driver.c | 2 -- 1 file changed, 2 deletions(-)