From 269e6ea95311130f75c4eb21bf1797a4cadfb82d Mon Sep 17 00:00:00 2001

From: Sagar Arun Kamble <sagar.a.kamble@intel.com>

Date: Fri, 29 Sep 2017 10:28:36 +0530

Subject: [PATCH] drm/i915: Move i915_gem_restore_fences to i915_gem_resume

Mime-version: 1.0

Content-type: text/plain; charset=UTF-8

Content-transfer-encoding: 8bit

Git-commit: 269e6ea95311130f75c4eb21bf1797a4cadfb82d

Patch-mainline: v4.15-rc1

References: FATE#322643 bsc#1055900

i915_gem_restore_fences is GEM resumption task hence it is moved to

i915_gem_resume from i915_restore_state.

Signed-off-by: Sagar 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: Michal Wajdeczko <michal.wajdeczko@intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/gpu/drm/i915/i915_gem.c     |    1 +

 drivers/gpu/drm/i915/i915_suspend.c |    2 --

 2 files changed, 1 insertion(+), 2 deletions(-)

--- a/drivers/gpu/drm/i915/i915_gem.c

+++ b/drivers/gpu/drm/i915/i915_gem.c

@@ -4620,6 +4620,7 @@ void i915_gem_resume(struct drm_i915_pri

 	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

--- a/drivers/gpu/drm/i915/i915_suspend.c

+++ b/drivers/gpu/drm/i915/i915_suspend.c

@@ -108,8 +108,6 @@ int i915_restore_state(struct drm_i915_p

 	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);