From patchwork Tue Oct 17 07:54:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Govindapillai, Vinod" X-Patchwork-Id: 13424722 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DB95ACDB474 for ; Tue, 17 Oct 2023 07:54:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 68E4110E158; Tue, 17 Oct 2023 07:54:59 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 148BD10E158 for ; Tue, 17 Oct 2023 07:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697529298; x=1729065298; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=20wBU5sGO8SZdKL2h9lnfZeSpKWd+Fv7aOm5md+dL48=; b=ch8+MWk3D+T/GZRc0bb+2FJyvgAvIpL36nRQsmWtN6RPWRkWwlduAva9 9ya+X4Sbnp2H0zoz0hxNqN2v17Fp4k3hfPG22x95cWirbMUdbGmtO3FIC 5pr9O7RZmTHkkIW5RDdwW4gW/NEIyOZzDHTjxxgllxSCpSyBE3bhf+4ya JM9FRaGyIq44gXxrfHW/gt4rspc4H/vf0zTdhj8/a9U86lt4Z7C13H+tC NYCXmh8yinZd+qg1iLXq/YA+2flcAmRx9lT09GwbW3H9AxBG6C6NE5IEJ Vy1yu4QJs+hpaAxwvr9EaIzor3DVNXRxJVRrU54ZUt6CDIb3zVDROTU3I w==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="471944703" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="471944703" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2023 00:54:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="899821230" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="899821230" Received: from ksuvorov-mobl.ger.corp.intel.com (HELO vgovind2-mobl3.intel.com) ([10.251.208.145]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2023 00:52:48 -0700 From: Vinod Govindapillai To: intel-gfx@lists.freedesktop.org Date: Tue, 17 Oct 2023 10:54:34 +0300 Message-Id: <20231017075435.95320-2-vinod.govindapillai@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017075435.95320-1-vinod.govindapillai@intel.com> References: <20231017075435.95320-1-vinod.govindapillai@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v1 1/2] drm/i915/display: display device info debugfs entry X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Have a common debugfs entry to get the display device info for both xe and i915 drivers. Signed-off-by: Vinod Govindapillai --- drivers/gpu/drm/i915/display/intel_display_debugfs.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index fbe75d47a165..ed83339f50f0 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -641,6 +641,16 @@ static int i915_display_info(struct seq_file *m, void *unused) return 0; } +static int i915_display_device_info(struct seq_file *m, void *unused) +{ + struct drm_i915_private *i915 = node_to_i915(m->private); + struct drm_printer p = drm_seq_file_printer(m); + + intel_display_device_info_print(DISPLAY_INFO(i915), DISPLAY_RUNTIME_INFO(i915), &p); + + return 0; +} + static int i915_shared_dplls_info(struct seq_file *m, void *unused) { struct drm_i915_private *dev_priv = node_to_i915(m->private); @@ -1059,6 +1069,7 @@ static const struct drm_info_list intel_display_debugfs_list[] = { {"i915_gem_framebuffer", i915_gem_framebuffer_info, 0}, {"i915_power_domain_info", i915_power_domain_info, 0}, {"i915_display_info", i915_display_info, 0}, + {"i915_display_device_info", i915_display_device_info, 0}, {"i915_shared_dplls_info", i915_shared_dplls_info, 0}, {"i915_dp_mst_info", i915_dp_mst_info, 0}, {"i915_ddb_info", i915_ddb_info, 0}, From patchwork Tue Oct 17 07:54:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Govindapillai, Vinod" X-Patchwork-Id: 13424723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4C6ECDB474 for ; Tue, 17 Oct 2023 07:55:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 75EF610E282; Tue, 17 Oct 2023 07:55:02 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2CAB310E282 for ; Tue, 17 Oct 2023 07:54:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697529298; x=1729065298; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=J1s4oAgctz/3TKFhUBErtM9arwwSoiLgzaV7dpkvKAA=; b=Ngmxs4USG3qP0r87wBei56i3sbsnMIkVhZIXk2YDg1/PXoW7EadkPBda vpU/G8SjeqjDoUqcd2zoN3FioWE3BIf4BvgFAY+D+0Jn/3E4iu/bA322d //FqxZbZBfFGw49mWsJ7IkEJDIFWxW7RD+n/CgbMOrHar0y4Tja6of0l2 otqhbkUdHkcNo+1Kgqp8uMtK4e/CBONcP4y1dbEtKg195I+916kG2HPSs V/bv0gKQMNa9dsbs/bg/qiBmR3gNlN2+7VCUP8OpuEB0RB2GxovdnA24I yFXDl2k3STamGUM94+2j41162ZvHTBoEfcwkoUR2NdrmS9hfyT9ro13dt g==; X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="471944709" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="471944709" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2023 00:54:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10865"; a="899821257" X-IronPort-AV: E=Sophos;i="6.03,231,1694761200"; d="scan'208";a="899821257" Received: from ksuvorov-mobl.ger.corp.intel.com (HELO vgovind2-mobl3.intel.com) ([10.251.208.145]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2023 00:52:51 -0700 From: Vinod Govindapillai To: intel-gfx@lists.freedesktop.org Date: Tue, 17 Oct 2023 10:54:35 +0300 Message-Id: <20231017075435.95320-3-vinod.govindapillai@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017075435.95320-1-vinod.govindapillai@intel.com> References: <20231017075435.95320-1-vinod.govindapillai@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v1 2/2] drm/i915: remove display device info from i915 capabilities X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Display device info is exposed as a separate debugfs entry. So remove the duplicate entries from i915_capabilities debugfs Signed-off-by: Vinod Govindapillai --- drivers/gpu/drm/i915/i915_debugfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index e9b79c2c37d8..bb48feb3b12e 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -67,7 +67,6 @@ static int i915_capabilities(struct seq_file *m, void *data) seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(i915)); intel_device_info_print(INTEL_INFO(i915), RUNTIME_INFO(i915), &p); - intel_display_device_info_print(DISPLAY_INFO(i915), DISPLAY_RUNTIME_INFO(i915), &p); i915_print_iommu_status(i915, &p); intel_gt_info_print(&to_gt(i915)->info, &p); intel_driver_caps_print(&i915->caps, &p);