diff mbox

[v12,03/11] drm/i915: Move i915_gem_restore_fences to i915_gem_resume

Message ID 1506581329-29720-4-git-send-email-sagar.a.kamble@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

sagar.a.kamble@intel.com Sept. 28, 2017, 6:48 a.m. UTC
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: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: MichaƂ Winiarski <michal.winiarski@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c     | 1 +
 drivers/gpu/drm/i915/i915_suspend.c | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

Comments

Joonas Lahtinen Sept. 29, 2017, 11:48 a.m. UTC | #1
On Thu, 2017-09-28 at 12:18 +0530, Sagar Arun Kamble wrote:
> i915_gem_restore_fences is GEM resumption task hence it is moved to
> i915_gem_resume from i915_restore_state.

+ Chris

Didn't I just review this patch elsewhere? Other thread explains that
the emytology of fixing display checks out, what you suggest is more
appropriate. Question is if we should note with a comment?

PS. You seem to have sent this with --suppress-cc, which decreases the
chances of getting the reviews :)

Regards, Joonas
sagar.a.kamble@intel.com Sept. 29, 2017, 1:59 p.m. UTC | #2
On 9/29/2017 5:18 PM, Joonas Lahtinen wrote:
> On Thu, 2017-09-28 at 12:18 +0530, Sagar Arun Kamble wrote:
>> i915_gem_restore_fences is GEM resumption task hence it is moved to
>> i915_gem_resume from i915_restore_state.
> + Chris
>
> Didn't I just review this patch elsewhere? Other thread explains that
> the emytology of fixing display checks out, what you suggest is more
> appropriate. Question is if we should note with a comment?
>
> PS. You seem to have sent this with --suppress-cc, which decreases the
> chances of getting the reviews :)
No. this was sent without "--suppress-cc". I actually floated two 
revisions yesterday so it might have been missed.
Sorry for the thrash.
How did you figure out "--suppress-cc"? Don't see in the headers
>
> Regards, Joonas
sagar.a.kamble@intel.com Sept. 29, 2017, 2:01 p.m. UTC | #3
On 9/29/2017 7:29 PM, Sagar Arun Kamble wrote:
>
>
> On 9/29/2017 5:18 PM, Joonas Lahtinen wrote:
>> On Thu, 2017-09-28 at 12:18 +0530, Sagar Arun Kamble wrote:
>>> i915_gem_restore_fences is GEM resumption task hence it is moved to
>>> i915_gem_resume from i915_restore_state.
>> + Chris
>>
>> Didn't I just review this patch elsewhere? Other thread explains that
>> the emytology of fixing display checks out, what you suggest is more
>> appropriate. Question is if we should note with a comment?
Yes. I had pulled this patch out of this series today. Chris has taken 
that one for push. Thanks for review.
https://patchwork.freedesktop.org/series/31118/
>>
>> PS. You seem to have sent this with --suppress-cc, which decreases the
>> chances of getting the reviews :)
> No. this was sent without "--suppress-cc". I actually floated two 
> revisions yesterday so it might have been missed.
> Sorry for the thrash.
> How did you figure out "--suppress-cc"? Don't see in the headers
>>
>> Regards, Joonas
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen Oct. 2, 2017, 8:33 a.m. UTC | #4
On Fri, 2017-09-29 at 19:29 +0530, Sagar Arun Kamble wrote:
> 
> On 9/29/2017 5:18 PM, Joonas Lahtinen wrote:
> > On Thu, 2017-09-28 at 12:18 +0530, Sagar Arun Kamble wrote:
> > > i915_gem_restore_fences is GEM resumption task hence it is moved to
> > > i915_gem_resume from i915_restore_state.
> > 
> > + Chris
> > 
> > Didn't I just review this patch elsewhere? Other thread explains that
> > the emytology of fixing display checks out, what you suggest is more
> > appropriate. Question is if we should note with a comment?
> > 
> > PS. You seem to have sent this with --suppress-cc, which decreases the
> > chances of getting the reviews :)
> 
> No. this was sent without "--suppress-cc". I actually floated two 
> revisions yesterday so it might have been missed.
> Sorry for the thrash.
> How did you figure out "--suppress-cc"? Don't see in the headers

There were Cc: entries in the text, but as the patch reached me, there
were none.

Could be the mailing list acting weird, too.

Regards, Joonas
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 932ac22..889b35f 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4611,6 +4611,7 @@  int 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
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 5c86925a..8f3aa4d 100644
--- 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_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);