Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 269e6ea9 authored by Sagar Arun Kamble's avatar Sagar Arun Kamble Committed by Chris Wilson
Browse files

drm/i915: Move i915_gem_restore_fences to i915_gem_resume 



i915_gem_restore_fences is GEM resumption task hence it is moved to
i915_gem_resume from i915_restore_state.

Signed-off-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1506661116-12106-1-git-send-email-sagar.a.kamble@intel.com


Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 60456d5c

drivers/gpu/drm/i915/i915_gem.c

+1 −0
Original line number Diff line number Diff line
@@ -4595,6 +4595,7 @@ void i915_gem_resume(struct drm_i915_private *dev_priv) 


	mutex_lock(&dev->struct_mutex);

	i915_gem_restore_gtt_mappings(dev_priv);

	i915_gem_restore_fences(dev_priv);



	/* As we didn't flush the kernel context before suspend, we cannot

	 * guarantee that the context image is complete. So let's just reset

drivers/gpu/drm/i915/i915_suspend.c

+0 −2
Original line number Diff line number Diff line
@@ -108,8 +108,6 @@ int i915_restore_state(struct drm_i915_private *dev_priv) 


	mutex_lock(&dev_priv->drm.struct_mutex);



	i915_gem_restore_fences(dev_priv);



	if (IS_GEN4(dev_priv))

		pci_write_config_word(pdev, GCDGMBUS,

				      dev_priv->regfile.saveGCDGMBUS);