From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 1/7] drm/i915: Fix retrieval of hangcheck stats
Date: Wed, 3 Jul 2013 17:22:06 +0300 [thread overview]
Message-ID: <1372861332-6308-2-git-send-email-mika.kuoppala@intel.com> (raw)
In-Reply-To: <1372861332-6308-1-git-send-email-mika.kuoppala@intel.com>
From: Chris Wilson <chris@chris-wilson.co.uk>
The default context is always supported (as it contains the global
hangcheck stats) and the contexts for hangcheck are not limited
to any ring.
References: https://bugs.freedesktop.org/show_bug.cgi?id=65845
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 2 +-
drivers/gpu/drm/i915/i915_gem_context.c | 23 ++++++++---------------
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a7c2cfb3..8e73e3b 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1840,7 +1840,7 @@ static inline void i915_gem_context_unreference(struct i915_hw_context *ctx)
}
struct i915_ctx_hang_stats * __must_check
-i915_gem_context_get_hang_stats(struct intel_ring_buffer *ring,
+i915_gem_context_get_hang_stats(struct drm_device *dev,
struct drm_file *file,
u32 id);
int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 51b7a21..05ef1c2 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -304,31 +304,24 @@ static int context_idr_cleanup(int id, void *p, void *data)
}
struct i915_ctx_hang_stats *
-i915_gem_context_get_hang_stats(struct intel_ring_buffer *ring,
+i915_gem_context_get_hang_stats(struct drm_device *dev,
struct drm_file *file,
u32 id)
{
- struct drm_i915_private *dev_priv = ring->dev->dev_private;
+ struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_i915_file_private *file_priv = file->driver_priv;
- struct i915_hw_context *to;
-
- if (dev_priv->hw_contexts_disabled)
- return ERR_PTR(-ENOENT);
-
- if (ring->id != RCS)
- return ERR_PTR(-EINVAL);
-
- if (file == NULL)
- return ERR_PTR(-EINVAL);
+ struct i915_hw_context *ctx;
if (id == DEFAULT_CONTEXT_ID)
return &file_priv->hang_stats;
- to = i915_gem_context_get(file->driver_priv, id);
- if (to == NULL)
+ ctx = NULL;
+ if (!dev_priv->hw_contexts_disabled)
+ ctx = i915_gem_context_get(file->driver_priv, id);
+ if (ctx == NULL)
return ERR_PTR(-ENOENT);
- return &to->hang_stats;
+ return &ctx->hang_stats;
}
void i915_gem_context_close(struct drm_device *dev, struct drm_file *file)
--
1.7.9.5
next prev parent reply other threads:[~2013-07-03 14:23 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 14:22 [PATCH 0/7] Hangcheck and arb robustness Mika Kuoppala
2013-07-03 14:22 ` Mika Kuoppala [this message]
2013-07-03 14:22 ` [PATCH 2/7] drm/i915: Replace open-coding of DEFAULT_CONTEXT_ID Mika Kuoppala
2013-07-03 14:22 ` [PATCH 3/7] drm/i915: introduce i915_queue_hangcheck Mika Kuoppala
2013-07-03 14:22 ` [PATCH 4/7] drm/i915: no hangcheck when reset is in progress Mika Kuoppala
2013-07-16 8:45 ` Daniel Vetter
2013-07-03 14:22 ` [PATCH 5/7] drm/i915: queue hangcheck on reset Mika Kuoppala
2013-07-16 8:49 ` Daniel Vetter
2013-07-16 9:16 ` Chris Wilson
2013-07-03 14:22 ` [PATCH 6/7] drm/i915: add i915_reset_count Mika Kuoppala
2013-07-03 14:22 ` [PATCH 7/7] drm/i915: add i915_get_reset_stats_ioctl Mika Kuoppala
2013-07-03 15:14 ` Chris Wilson
2013-07-03 21:23 ` Ben Widawsky
2013-07-03 21:41 ` Chris Wilson
2013-07-03 21:44 ` Ben Widawsky
2013-07-03 21:58 ` Daniel Vetter
2013-07-03 22:00 ` Ben Widawsky
2013-07-04 7:54 ` Ville Syrjälä
2013-07-04 16:39 ` Ben Widawsky
2013-10-26 1:42 ` Ian Romanick
2013-10-27 12:30 ` Daniel Vetter
2013-10-29 22:29 ` Ian Romanick
2013-10-30 8:21 ` Daniel Vetter
2013-11-08 5:48 ` Dave Airlie
2013-11-08 6:32 ` Daniel Vetter
2013-11-08 17:21 ` Ian Romanick
2013-11-08 19:00 ` Dave Airlie
2013-11-08 21:20 ` Ian Romanick
2013-11-08 19:22 ` Jesse Barnes
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=1372861332-6308-2-git-send-email-mika.kuoppala@intel.com \
--to=mika.kuoppala@linux.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.