From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/3] drm/i915/uc: Make uc_sanitize part of gt_sanitize
Date: Wed, 22 May 2019 19:00:55 +0000 [thread overview]
Message-ID: <20190522190057.848-2-michal.wajdeczko@intel.com> (raw)
In-Reply-To: <20190522190057.848-1-michal.wajdeczko@intel.com>
In gt_sanitize we reset whole GPU (and indirectly uC).
Make sure we don't miss to run our dedicated uC sanitize code.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 ++
drivers/gpu/drm/i915/i915_gem_pm.c | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
index ae7155f0e063..af6bcc7eabf3 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
@@ -114,6 +114,8 @@ void intel_gt_sanitize(struct drm_i915_private *i915, bool force)
if (!reset_engines(i915) && !force)
return;
+ intel_uc_sanitize(i915);
+
for_each_engine(engine, i915, id)
intel_engine_reset(engine, false);
}
diff --git a/drivers/gpu/drm/i915/i915_gem_pm.c b/drivers/gpu/drm/i915/i915_gem_pm.c
index fa9c2ebd966a..af3a3def45d8 100644
--- a/drivers/gpu/drm/i915/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/i915_gem_pm.c
@@ -193,7 +193,6 @@ void i915_gem_suspend_late(struct drm_i915_private *i915)
}
mutex_unlock(&i915->drm.struct_mutex);
- intel_uc_sanitize(i915);
i915_gem_sanitize(i915);
}
--
2.19.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-05-22 19:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 19:00 [PATCH 0/3] drm/i915: HuC updates Michal Wajdeczko
2019-05-22 19:00 ` Michal Wajdeczko [this message]
2019-05-22 20:11 ` [PATCH 1/3] drm/i915/uc: Make uc_sanitize part of gt_sanitize Chris Wilson
2019-05-22 19:00 ` [PATCH 2/3] drm/i915/huc: Check HuC firmware status only once Michal Wajdeczko
2019-05-22 20:13 ` Chris Wilson
2019-05-23 11:58 ` Ye, Tony
2019-05-22 19:00 ` [PATCH 3/3] drm/i915/huc: Update HuC status codes Michal Wajdeczko
2019-05-22 20:19 ` Chris Wilson
2019-05-22 22:25 ` Michal Wajdeczko
2019-05-31 10:13 ` Joonas Lahtinen
2019-05-31 19:06 ` Michal Wajdeczko
2019-05-22 19:50 ` ✓ Fi.CI.BAT: success for drm/i915: HuC updates Patchwork
2019-05-23 15:56 ` ✗ Fi.CI.IGT: failure " 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=20190522190057.848-2-michal.wajdeczko@intel.com \
--to=michal.wajdeczko@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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.