From: Sagar Arun Kamble <sagar.a.kamble@intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>,
Michal Wajdeczko <michal.wajdeczko@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH v3 1/2] drm/i915/uc: Start preparing GuC/HuC for reset
Date: Thu, 8 Mar 2018 11:17:35 +0530 [thread overview]
Message-ID: <b366d52d-6136-124d-ff92-3c40dbea216b@intel.com> (raw)
In-Reply-To: <152026098747.15835.1164442216461887520@mail.alporthouse.com>
On 3/5/2018 8:13 PM, Chris Wilson wrote:
> Quoting Michal Wajdeczko (2018-03-05 14:29:16)
>> Right after GPU reset there will be a small window of time during which
>> some of GuC/HuC fields will still show state before reset. Let's start
>> to fix that by sanitizing firmware status as we will use it shortly.
>>
>> v2: s/reset_prepare/prepare_to_reset (Michel)
>> don't forget about gem_sanitize path (Daniele)
>> v3: rebased
>>
>> Suggested-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Michel Thierry <michel.thierry@intel.com>
>> Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> ---
>> drivers/gpu/drm/i915/i915_gem.c | 5 ++++-
>> drivers/gpu/drm/i915/intel_guc.h | 5 +++++
>> drivers/gpu/drm/i915/intel_huc.h | 5 +++++
>> drivers/gpu/drm/i915/intel_uc.c | 14 ++++++++++++++
>> drivers/gpu/drm/i915/intel_uc.h | 1 +
>> drivers/gpu/drm/i915/intel_uc_fw.h | 6 ++++++
>> 6 files changed, 35 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>> index a5bd073..aedb17d 100644
>> --- a/drivers/gpu/drm/i915/i915_gem.c
>> +++ b/drivers/gpu/drm/i915/i915_gem.c
>> @@ -2981,6 +2981,7 @@ int i915_gem_reset_prepare(struct drm_i915_private *dev_priv)
>> }
>>
>> i915_gem_revoke_fences(dev_priv);
>> + intel_uc_prepare_to_reset(dev_priv);
>>
>> return err;
>> }
>> @@ -4882,8 +4883,10 @@ void i915_gem_sanitize(struct drm_i915_private *i915)
>> * it may impact the display and we are uncertain about the stability
>> * of the reset, so this could be applied to even earlier gen.
>> */
>> - if (INTEL_GEN(i915) >= 5 && intel_has_gpu_reset(i915))
>> + if (INTEL_GEN(i915) >= 5 && intel_has_gpu_reset(i915)) {
>> + intel_uc_prepare_to_reset(i915);
>> WARN_ON(intel_gpu_reset(i915, ALL_ENGINES));
> This still feels wrong. If we accept that we will have to reload the fw
> on resume, why are we not just sanitzing the uc state and forcing the
> reload?
Hi Chris,
intel_uc_prepare_to_reset() is sanitizing uc state and reload is
happening through gem_init_hw in resume path.
what are we missing?
Thanks,
Sagar
> -Chris
--
Thanks,
Sagar
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-03-08 5:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-05 14:29 [PATCH v3 1/2] drm/i915/uc: Start preparing GuC/HuC for reset Michal Wajdeczko
2018-03-05 14:29 ` [PATCH v3 2/2] HAX: Enable GuC for CI Michal Wajdeczko
2018-03-05 14:43 ` [PATCH v3 1/2] drm/i915/uc: Start preparing GuC/HuC for reset Chris Wilson
2018-03-08 5:47 ` Sagar Arun Kamble [this message]
2018-03-08 10:06 ` Michal Wajdeczko
2018-03-05 14:51 ` ✗ Fi.CI.BAT: failure for series starting with [v3,1/2] " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b366d52d-6136-124d-ff92-3c40dbea216b@intel.com \
--to=sagar.a.kamble@intel.com \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=michal.wajdeczko@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.