From patchwork Thu Oct 23 17:35:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 5142351 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 70128C11AC for ; Thu, 23 Oct 2014 17:36:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F41F201FB for ; Thu, 23 Oct 2014 17:36:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 88CF320204 for ; Thu, 23 Oct 2014 17:36:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A9D46E4E0; Thu, 23 Oct 2014 10:36:06 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 091576E4E0 for ; Thu, 23 Oct 2014 10:36:05 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 23 Oct 2014 10:35:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,776,1406617200"; d="scan'208";a="619315003" Received: from rosetta.fi.intel.com (HELO rosetta) ([10.237.72.93]) by fmsmga002.fm.intel.com with ESMTP; 23 Oct 2014 10:33:19 -0700 Received: by rosetta (Postfix, from userid 1000) id 52BF580055; Thu, 23 Oct 2014 20:35:27 +0300 (EEST) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Thu, 23 Oct 2014 20:35:24 +0300 Message-Id: <1414085724-10087-3-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414085724-10087-1-git-send-email-mika.kuoppala@intel.com> References: <1414085724-10087-1-git-send-email-mika.kuoppala@intel.com> Cc: miku@iki.fi Subject: [Intel-gfx] [PATCH 3/3] drm/i915: Grab gpu state through debugfs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP because it is handy to direct bug reporters to do things like: 'grep -i suspend /sys/kernel/debug/dri/0/i915_gpu_state' Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/i915_debugfs.c | 42 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_gpu_error.c | 22 ++++++++++++++---- 3 files changed, 64 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index e60d5c2..8d3266d 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -976,6 +976,47 @@ static const struct file_operations i915_error_state_fops = { .release = i915_error_state_release, }; +static int i915_gpu_state_open(struct inode *inode, struct file *file) +{ + struct drm_device *dev = inode->i_private; + struct i915_error_state_file_priv *gpu_priv; + + gpu_priv = kzalloc(sizeof(*gpu_priv), GFP_KERNEL); + if (!gpu_priv) + return -ENOMEM; + + gpu_priv->dev = dev; + + gpu_priv->error = i915_capture_gpu_state(dev); + if (gpu_priv->error == NULL) { + kfree(gpu_priv); + return -ENOMEM; + } + + file->private_data = gpu_priv; + + return 0; +} + +static int i915_gpu_state_release(struct inode *inode, struct file *file) +{ + struct i915_error_state_file_priv *gpu_priv = file->private_data; + + kref_put(&gpu_priv->error->ref, i915_gpu_state_free); + kfree(gpu_priv); + + return 0; +} + +static const struct file_operations i915_gpu_state_fops = { + .owner = THIS_MODULE, + .open = i915_gpu_state_open, + .read = i915_error_state_read, + .write = NULL, + .llseek = default_llseek, + .release = i915_gpu_state_release, +}; + static int i915_next_seqno_get(void *data, u64 *val) { @@ -4217,6 +4258,7 @@ static const struct i915_debugfs_files { {"i915_ring_test_irq", &i915_ring_test_irq_fops}, {"i915_gem_drop_caches", &i915_drop_caches_fops}, {"i915_error_state", &i915_error_state_fops}, + {"i915_gpu_state", &i915_gpu_state_fops}, {"i915_next_seqno", &i915_next_seqno_fops}, {"i915_display_crc_ctl", &i915_display_crc_ctl_fops}, {"i915_pri_wm_latency", &i915_pri_wm_latency_fops}, diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 23e7f20..cbefc64 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2756,6 +2756,10 @@ static inline void i915_error_state_buf_release( { kfree(eb->buf); } + +struct drm_i915_error_state *i915_capture_gpu_state(struct drm_device *dev); +void i915_gpu_state_free(struct kref *error_ref); + void i915_capture_error_state(struct drm_device *dev, bool wedge, const char *error_msg); void i915_error_state_get(struct drm_device *dev, diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index c11882a..76211b5 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -538,7 +538,7 @@ static void i915_error_object_free(struct drm_i915_error_object *obj) kfree(obj); } -static void i915_error_state_free(struct kref *error_ref) +void i915_gpu_state_free(struct kref *error_ref) { struct drm_i915_error_state *error = container_of(error_ref, typeof(*error), ref); @@ -1291,6 +1291,20 @@ __i915_capture_gpu_state(struct drm_device *dev) return error; } +struct drm_i915_error_state *i915_capture_gpu_state(struct drm_device *dev) +{ + struct drm_i915_error_state *gpu_state; + + gpu_state = __i915_capture_gpu_state(dev); + if (gpu_state == NULL) + return NULL; + + scnprintf(gpu_state->error_msg, sizeof(gpu_state->error_msg), + "GPU state snapshot\n"); + + return gpu_state; +} + /** * i915_capture_error_state - capture an error record for later analysis * @dev: drm device @@ -1323,7 +1337,7 @@ void i915_capture_error_state(struct drm_device *dev, bool wedged, spin_unlock_irqrestore(&dev_priv->gpu_error.lock, flags); if (error) { - i915_error_state_free(&error->ref); + i915_gpu_state_free(&error->ref); return; } @@ -1353,7 +1367,7 @@ void i915_error_state_get(struct drm_device *dev, void i915_error_state_put(struct i915_error_state_file_priv *error_priv) { if (error_priv->error) - kref_put(&error_priv->error->ref, i915_error_state_free); + kref_put(&error_priv->error->ref, i915_gpu_state_free); } void i915_destroy_error_state(struct drm_device *dev) @@ -1367,7 +1381,7 @@ void i915_destroy_error_state(struct drm_device *dev) spin_unlock_irq(&dev_priv->gpu_error.lock); if (error) - kref_put(&error->ref, i915_error_state_free); + kref_put(&error->ref, i915_gpu_state_free); } const char *i915_cache_level_str(struct drm_i915_private *i915, int type)