From patchwork Fri May 27 19:43:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akash.goel@intel.com X-Patchwork-Id: 9138905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DF2C26075A for ; Fri, 27 May 2016 19:32:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1E2927CF9 for ; Fri, 27 May 2016 19:32:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6C2828294; Fri, 27 May 2016 19:32:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8005D27CF9 for ; Fri, 27 May 2016 19:32:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E319C6ED1B; Fri, 27 May 2016 19:32:04 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 46C426ED15 for ; Fri, 27 May 2016 19:30:13 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 27 May 2016 12:30:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,375,1459839600"; d="scan'208";a="986117594" Received: from akashgoe-desktop.iind.intel.com ([10.223.82.36]) by orsmga002.jf.intel.com with ESMTP; 27 May 2016 12:30:10 -0700 From: akash.goel@intel.com To: intel-gfx@lists.freedesktop.org Date: Sat, 28 May 2016 01:13:00 +0530 Message-Id: <1464378183-9433-10-git-send-email-akash.goel@intel.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1464378183-9433-1-git-send-email-akash.goel@intel.com> References: <1464378183-9433-1-git-send-email-akash.goel@intel.com> Cc: sourab.gupta@intel.com, Akash Goel Subject: [Intel-gfx] [RFC 09/12] drm/i915: Add a char device file interface to capture GuC ukernel logs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Virus-Scanned: ClamAV using ClamSMTP From: Akash Goel This patch provides a new character device file interface '/dev/dri/guc_log' for the User to capture the GuC ukernel logs. Signed-off-by: Akash Goel --- drivers/gpu/drm/i915/i915_guc_submission.c | 51 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 2 ++ 2 files changed, 53 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index 149826a..8a79b6d 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "i915_drv.h" #include "intel_guc.h" @@ -983,6 +984,54 @@ static void guc_create_log_relay_file(struct intel_guc *guc) if (i915.guc_log_level >= 0) gen8_enable_guc_interrupts(dev); } +#else +static ssize_t guc_log_read(struct file *file, char __user *buf, + size_t len, loff_t *pos) +{ + return 0; +} + +static int guc_log_release(struct inode *inode, struct file *file) +{ + return 0; +} + +static int guc_log_open(struct inode *inode, struct file *file) +{ + struct miscdevice *miscdev = file->private_data; + struct intel_guc_log *guc_log = + container_of(miscdev, struct intel_guc_log, misc_dev); + struct intel_guc *guc = + container_of(guc_log, struct intel_guc, log); + + return 0; +} + +static const struct file_operations guc_log_fops = { + .owner = THIS_MODULE, + .open = guc_log_open, + .release = guc_log_release, + .read = guc_log_read, + .llseek = no_llseek, +}; + +static void guc_remove_log_device_file(struct intel_guc *guc) +{ + misc_deregister(&guc->log.misc_dev); +} + +static void guc_create_log_device_file(struct intel_guc *guc) +{ + guc->log.misc_dev.minor = MISC_DYNAMIC_MINOR; + guc->log.misc_dev.name = "guc_log"; + guc->log.misc_dev.nodename = "dri/guc_log"; + guc->log.misc_dev.fops = &guc_log_fops; + + if (misc_register(&guc->log.misc_dev)) { + DRM_ERROR("failed to register misc device for guc logs!\n"); + return; + } +} #endif static void guc_logging_fini(struct intel_guc *guc) @@ -991,6 +1040,7 @@ static void guc_logging_fini(struct intel_guc *guc) guc_remove_log_relay_file(guc); #else if (guc->log.buf_obj) { + guc_remove_log_device_file(guc); i915_gem_object_unpin_map(guc->log.buf_obj); drm_gem_object_unreference(&guc->log.buf_obj->base); guc->log.buf_obj = NULL; @@ -1031,6 +1081,7 @@ static void guc_logging_init(struct intel_guc *guc) } guc->log.buf_obj = obj; + guc_create_log_device_file(guc); /* Enable the flush interrupt, we have a buffer to store GuC logs */ if (i915.guc_log_level >= 0) diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h index bdc3e63..13810d0 100644 --- a/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h @@ -127,6 +127,8 @@ struct intel_guc_log { wait_queue_head_t wq; uint64_t first_seq; uint64_t next_seq; + /* For Userspace clients to pull logs via /dev/dri/guc_log */ + struct miscdevice misc_dev; }; struct intel_guc {