On 25/09/2019 11:01, Chris Wilson wrote:
struct_mutex provides no serialisation of the registers and data structures being saved and restored across suspend/resume. It is completely superfluous here.Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_suspend.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 8508a01ad8b9..1bbfd8fd5124 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -65,8 +65,6 @@ int i915_save_state(struct drm_i915_private *dev_priv) struct pci_dev *pdev = dev_priv->drm.pdev; int i;- mutex_lock(&dev_priv->drm.struct_mutex);- i915_save_display(dev_priv);if (IS_GEN(dev_priv, 4))@@ -100,8 +98,6 @@ int i915_save_state(struct drm_i915_private *dev_priv) dev_priv->regfile.saveSWF3[i] = I915_READ(SWF3(i)); }- mutex_unlock(&dev_priv->drm.struct_mutex);- return 0; }@@ -110,8 +106,6 @@ int i915_restore_state(struct drm_i915_private *dev_priv)struct pci_dev *pdev = dev_priv->drm.pdev; int i;- mutex_lock(&dev_priv->drm.struct_mutex);- if (IS_GEN(dev_priv, 4)) pci_write_config_word(pdev, GCDGMBUS, dev_priv->regfile.saveGCDGMBUS); @@ -145,8 +139,6 @@ int i915_restore_state(struct drm_i915_private *dev_priv) I915_WRITE(SWF3(i), dev_priv->regfile.saveSWF3[i]); }- mutex_unlock(&dev_priv->drm.struct_mutex);- intel_gmbus_reset(dev_priv);return 0;
Reviewed-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com> Regards, Tvrtko _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
