All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tomas Elf <tomas.elf@intel.com>
To: Intel-GFX@Lists.FreeDesktop.Org
Subject: [PATCH 01/20] drm/i915: Make i915_gem_reset_ring_status() public
Date: Fri, 23 Oct 2015 02:32:23 +0100	[thread overview]
Message-ID: <1445563962-20753-2-git-send-email-tomas.elf@intel.com> (raw)
In-Reply-To: <1445563962-20753-1-git-send-email-tomas.elf@intel.com>

Makes i915_gem_reset_ring_status() public for use from engine reset path in
order to replicate the same behavior as in full GPU reset but for a single
engine.

Signed-off-by: Tomas Elf <tomas.elf@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_drv.h | 2 ++
 drivers/gpu/drm/i915/i915_gem.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 8afda45..9f6570a 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2957,6 +2957,8 @@ static inline bool i915_stop_ring_allow_warn(struct drm_i915_private *dev_priv)
 }
 
 void i915_gem_reset(struct drm_device *dev);
+void i915_gem_reset_ring_status(struct drm_i915_private *dev_priv,
+			        struct intel_engine_cs *ring);
 bool i915_gem_clflush_object(struct drm_i915_gem_object *obj, bool force);
 int __must_check i915_gem_init(struct drm_device *dev);
 int i915_gem_init_rings(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e57061a..e75dc79 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2716,8 +2716,8 @@ i915_gem_find_active_request(struct intel_engine_cs *ring)
 	return NULL;
 }
 
-static void i915_gem_reset_ring_status(struct drm_i915_private *dev_priv,
-				       struct intel_engine_cs *ring)
+void i915_gem_reset_ring_status(struct drm_i915_private *dev_priv,
+			        struct intel_engine_cs *ring)
 {
 	struct drm_i915_gem_request *request;
 	bool ring_hung;
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2015-10-23  1:32 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-23  1:32 [PATCH 00/20] TDR/watchdog support for gen8 Tomas Elf
2015-10-23  1:32 ` Tomas Elf [this message]
2015-10-23  1:32 ` [PATCH 02/20] drm/i915: Generalise common GPU engine reset request/unrequest code Tomas Elf
2015-10-23  1:32 ` [PATCH 03/20] drm/i915: TDR / per-engine hang recovery support for gen8 Tomas Elf
2015-10-23  1:32 ` [PATCH 04/20] drm/i915: TDR / per-engine hang detection Tomas Elf
2015-10-23  1:32 ` [PATCH 05/20] drm/i915: Extending i915_gem_check_wedge to check engine reset in progress Tomas Elf
2015-10-23  1:32 ` [PATCH 06/20] drm/i915: Reinstate hang recovery work queue Tomas Elf
2015-10-23  1:32 ` [PATCH 07/20] drm/i915: Watchdog timeout: Hang detection integration into error handler Tomas Elf
2015-10-23  1:32 ` [PATCH 08/20] drm/i915: Watchdog timeout: IRQ handler for gen8 Tomas Elf
2015-10-23  1:32 ` [PATCH 09/20] drm/i915: Watchdog timeout: Ringbuffer command emission " Tomas Elf
2015-10-23  1:32 ` [PATCH 10/20] drm/i915: Watchdog timeout: DRM kernel interface enablement Tomas Elf
2016-01-22 13:59   ` Chris Wilson
2016-01-22 14:08     ` Arun Siluvery
2016-01-25 15:58       ` Daniel Vetter
2015-10-23  1:32 ` [PATCH 11/20] drm/i915: Fake lost context event interrupts through forced CSB checking Tomas Elf
2015-10-23  1:32 ` [PATCH 12/20] drm/i915: Debugfs interface for per-engine hang recovery Tomas Elf
2015-10-23  1:32 ` [PATCH 13/20] drm/i915: Test infrastructure for context state inconsistency simulation Tomas Elf
2015-10-23  1:32 ` [PATCH 14/20] drm/i915: TDR/watchdog trace points Tomas Elf
2015-10-23  1:32 ` [PATCH 15/20] drm/i915: Port of Added scheduler support to __wait_request() calls Tomas Elf
2015-10-23  1:32 ` [PATCH 16/20] drm/i915: Fix __i915_wait_request() behaviour during hang detection Tomas Elf
2015-10-23  1:32 ` [PATCH 17/20] drm/i915: Extended error state with TDR count, watchdog count and engine reset count Tomas Elf
2015-10-23  1:32 ` [PATCH 18/20] drm/i915: TDR / per-engine hang recovery kernel docs Tomas Elf
2015-10-23  1:32 ` [PATCH 19/20] drm/i915: drm/i915 changes to simulated hangs Tomas Elf
2016-01-22 13:43   ` Chris Wilson
2016-01-22 13:52     ` Arun Siluvery
2015-10-23  1:32 ` [PATCH 20/20] drm/i915: Enable TDR / per-engine hang recovery Tomas Elf
  -- strict thread matches above, loose matches on Subject: below --
2016-01-13 17:28 [PATCH 00/20] TDR/watchdog support for gen8 Arun Siluvery
2016-01-13 17:28 ` [PATCH 01/20] drm/i915: Make i915_gem_reset_ring_status() public Arun Siluvery

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=1445563962-20753-2-git-send-email-tomas.elf@intel.com \
    --to=tomas.elf@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.