Skip to content

Commit

Permalink
drm/i915: Move i915_gem_restore_fences to i915_gem_resume
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sagar Arun Kamble authored and Chris Wilson committed Sep 29, 2017
1 parent 60456d5 commit 269e6ea
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 1 addition & 0 deletions drivers/gpu/drm/i915/i915_gem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions drivers/gpu/drm/i915/i915_suspend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 269e6ea

Please sign in to comment.