From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E23FFC48BD1 for ; Thu, 10 Jun 2021 23:03:26 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AE01B613D9 for ; Thu, 10 Jun 2021 23:03:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE01B613D9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 62BE76EE0F; Thu, 10 Jun 2021 23:03:25 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F2CA6EE0F; Thu, 10 Jun 2021 23:03:24 +0000 (UTC) IronPort-SDR: MHoK5m+w9nYxv2F52uDDPCgUmchnCnetJJNYRNmmBQfMlwsCX9D1feUjkcPzVzyxbPQQKvSuN3 tHSndux8sQRA== X-IronPort-AV: E=McAfee;i="6200,9189,10011"; a="291054328" X-IronPort-AV: E=Sophos;i="5.83,264,1616482800"; d="scan'208";a="291054328" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2021 16:03:23 -0700 IronPort-SDR: GItl6KKHyN0Jo6rC/P+XPU6McZ0AGtp2e8DJ16ubAI7RlsYr3TmOCwsdBgXYJW6iS8c7yQHmbF myEPfke92wzA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,264,1616482800"; d="scan'208";a="470434268" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by fmsmga004.fm.intel.com with ESMTP; 10 Jun 2021 16:03:23 -0700 Received: from [10.249.139.200] (mwajdecz-MOBL.ger.corp.intel.com [10.249.139.200]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 15AN3L5c014728; Fri, 11 Jun 2021 00:03:22 +0100 Subject: Re: [Intel-gfx] [PATCH 3/3] drm/i915/uapi: Add query for L3 bank count To: John.C.Harrison@Intel.com, Intel-GFX@Lists.FreeDesktop.Org References: <20210610204626.2995262-1-John.C.Harrison@Intel.com> <20210610204626.2995262-4-John.C.Harrison@Intel.com> From: Michal Wajdeczko Message-ID: Date: Fri, 11 Jun 2021 01:03:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <20210610204626.2995262-4-John.C.Harrison@Intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: DRI-Devel@Lists.FreeDesktop.Org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 10.06.2021 22:46, John.C.Harrison@Intel.com wrote: > From: John Harrison > > Various UMDs need to know the L3 bank count. So add a query API for it. > > Signed-off-by: John Harrison > --- > drivers/gpu/drm/i915/gt/intel_gt.c | 15 +++++++++++++++ > drivers/gpu/drm/i915/gt/intel_gt.h | 1 + > drivers/gpu/drm/i915/i915_query.c | 22 ++++++++++++++++++++++ > drivers/gpu/drm/i915/i915_reg.h | 1 + > include/uapi/drm/i915_drm.h | 1 + > 5 files changed, 40 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c > index 2161bf01ef8b..708bb3581d83 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt.c > @@ -704,3 +704,18 @@ void intel_gt_info_print(const struct intel_gt_info *info, > > intel_sseu_dump(&info->sseu, p); > } > + > +int intel_gt_get_l3bank_count(struct intel_gt *gt) > +{ > + struct drm_i915_private *i915 = gt->i915; > + intel_wakeref_t wakeref; > + u32 fuse3; > + > + if (GRAPHICS_VER(i915) < 12) > + return -ENODEV; > + > + with_intel_runtime_pm(gt->uncore->rpm, wakeref) > + fuse3 = intel_uncore_read(gt->uncore, GEN10_MIRROR_FUSE3); > + > + return hweight32(REG_FIELD_GET(GEN12_GT_L3_MODE_MASK, ~fuse3)); > +} > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h > index 7ec395cace69..46aa1cf4cf30 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt.h > @@ -77,6 +77,7 @@ static inline bool intel_gt_is_wedged(const struct intel_gt *gt) > > void intel_gt_info_print(const struct intel_gt_info *info, > struct drm_printer *p); > +int intel_gt_get_l3bank_count(struct intel_gt *gt); > > void intel_gt_watchdog_work(struct work_struct *work); > > diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c > index 96bd8fb3e895..0e92bb2d21b2 100644 > --- a/drivers/gpu/drm/i915/i915_query.c > +++ b/drivers/gpu/drm/i915/i915_query.c > @@ -10,6 +10,7 @@ > #include "i915_perf.h" > #include "i915_query.h" > #include > +#include "gt/intel_gt.h" > > static int copy_query_item(void *query_hdr, size_t query_sz, > u32 total_length, > @@ -502,6 +503,26 @@ static int query_hwconfig_table(struct drm_i915_private *i915, > return hwconfig->size; > } > > +static int query_l3banks(struct drm_i915_private *i915, > + struct drm_i915_query_item *query_item) > +{ > + u32 banks; likely we also need to check: if (query_item->flags != 0) return -EINVAL; > + > + if (query_item->length == 0) > + return sizeof(banks); > + > + if (query_item->length < sizeof(banks)) > + return -EINVAL; > + > + banks = intel_gt_get_l3bank_count(&i915->gt); > + > + if (copy_to_user(u64_to_user_ptr(query_item->data_ptr), > + &banks, sizeof(banks))) > + return -EFAULT; > + > + return sizeof(banks); > +} > + > static int (* const i915_query_funcs[])(struct drm_i915_private *dev_priv, > struct drm_i915_query_item *query_item) = { > query_topology_info, > @@ -509,6 +530,7 @@ static int (* const i915_query_funcs[])(struct drm_i915_private *dev_priv, > query_perf_config, > query_memregion_info, > query_hwconfig_table, > + query_l3banks, > }; > > int i915_query_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index eb13c601d680..e9ba88fe3db7 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -3099,6 +3099,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > #define GEN10_MIRROR_FUSE3 _MMIO(0x9118) > #define GEN10_L3BANK_PAIR_COUNT 4 > #define GEN10_L3BANK_MASK 0x0F > +#define GEN12_GT_L3_MODE_MASK 0xFF > > #define GEN8_EU_DISABLE0 _MMIO(0x9134) > #define GEN8_EU_DIS0_S0_MASK 0xffffff > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > index 87d369cae22a..20d18cca5066 100644 > --- a/include/uapi/drm/i915_drm.h > +++ b/include/uapi/drm/i915_drm.h > @@ -2234,6 +2234,7 @@ struct drm_i915_query_item { > #define DRM_I915_QUERY_PERF_CONFIG 3 > #define DRM_I915_QUERY_MEMORY_REGIONS 4 > #define DRM_I915_QUERY_HWCONFIG_TABLE 5 > +#define DRM_I915_QUERY_L3_BANK_COUNT 6 > /* Must be kept compact -- no holes and well documented */ > > /** > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B964C48BDF for ; Thu, 10 Jun 2021 23:03:26 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E812161287 for ; Thu, 10 Jun 2021 23:03:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E812161287 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C99B6EE11; Thu, 10 Jun 2021 23:03:25 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F2CA6EE0F; Thu, 10 Jun 2021 23:03:24 +0000 (UTC) IronPort-SDR: MHoK5m+w9nYxv2F52uDDPCgUmchnCnetJJNYRNmmBQfMlwsCX9D1feUjkcPzVzyxbPQQKvSuN3 tHSndux8sQRA== X-IronPort-AV: E=McAfee;i="6200,9189,10011"; a="291054328" X-IronPort-AV: E=Sophos;i="5.83,264,1616482800"; d="scan'208";a="291054328" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2021 16:03:23 -0700 IronPort-SDR: GItl6KKHyN0Jo6rC/P+XPU6McZ0AGtp2e8DJ16ubAI7RlsYr3TmOCwsdBgXYJW6iS8c7yQHmbF myEPfke92wzA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,264,1616482800"; d="scan'208";a="470434268" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by fmsmga004.fm.intel.com with ESMTP; 10 Jun 2021 16:03:23 -0700 Received: from [10.249.139.200] (mwajdecz-MOBL.ger.corp.intel.com [10.249.139.200]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 15AN3L5c014728; Fri, 11 Jun 2021 00:03:22 +0100 To: John.C.Harrison@Intel.com, Intel-GFX@Lists.FreeDesktop.Org References: <20210610204626.2995262-1-John.C.Harrison@Intel.com> <20210610204626.2995262-4-John.C.Harrison@Intel.com> From: Michal Wajdeczko Message-ID: Date: Fri, 11 Jun 2021 01:03:21 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <20210610204626.2995262-4-John.C.Harrison@Intel.com> Content-Language: en-US Subject: Re: [Intel-gfx] [PATCH 3/3] drm/i915/uapi: Add query for L3 bank count 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: , Cc: DRI-Devel@Lists.FreeDesktop.Org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 10.06.2021 22:46, John.C.Harrison@Intel.com wrote: > From: John Harrison > > Various UMDs need to know the L3 bank count. So add a query API for it. > > Signed-off-by: John Harrison > --- > drivers/gpu/drm/i915/gt/intel_gt.c | 15 +++++++++++++++ > drivers/gpu/drm/i915/gt/intel_gt.h | 1 + > drivers/gpu/drm/i915/i915_query.c | 22 ++++++++++++++++++++++ > drivers/gpu/drm/i915/i915_reg.h | 1 + > include/uapi/drm/i915_drm.h | 1 + > 5 files changed, 40 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c > index 2161bf01ef8b..708bb3581d83 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt.c > @@ -704,3 +704,18 @@ void intel_gt_info_print(const struct intel_gt_info *info, > > intel_sseu_dump(&info->sseu, p); > } > + > +int intel_gt_get_l3bank_count(struct intel_gt *gt) > +{ > + struct drm_i915_private *i915 = gt->i915; > + intel_wakeref_t wakeref; > + u32 fuse3; > + > + if (GRAPHICS_VER(i915) < 12) > + return -ENODEV; > + > + with_intel_runtime_pm(gt->uncore->rpm, wakeref) > + fuse3 = intel_uncore_read(gt->uncore, GEN10_MIRROR_FUSE3); > + > + return hweight32(REG_FIELD_GET(GEN12_GT_L3_MODE_MASK, ~fuse3)); > +} > diff --git a/drivers/gpu/drm/i915/gt/intel_gt.h b/drivers/gpu/drm/i915/gt/intel_gt.h > index 7ec395cace69..46aa1cf4cf30 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt.h > @@ -77,6 +77,7 @@ static inline bool intel_gt_is_wedged(const struct intel_gt *gt) > > void intel_gt_info_print(const struct intel_gt_info *info, > struct drm_printer *p); > +int intel_gt_get_l3bank_count(struct intel_gt *gt); > > void intel_gt_watchdog_work(struct work_struct *work); > > diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c > index 96bd8fb3e895..0e92bb2d21b2 100644 > --- a/drivers/gpu/drm/i915/i915_query.c > +++ b/drivers/gpu/drm/i915/i915_query.c > @@ -10,6 +10,7 @@ > #include "i915_perf.h" > #include "i915_query.h" > #include > +#include "gt/intel_gt.h" > > static int copy_query_item(void *query_hdr, size_t query_sz, > u32 total_length, > @@ -502,6 +503,26 @@ static int query_hwconfig_table(struct drm_i915_private *i915, > return hwconfig->size; > } > > +static int query_l3banks(struct drm_i915_private *i915, > + struct drm_i915_query_item *query_item) > +{ > + u32 banks; likely we also need to check: if (query_item->flags != 0) return -EINVAL; > + > + if (query_item->length == 0) > + return sizeof(banks); > + > + if (query_item->length < sizeof(banks)) > + return -EINVAL; > + > + banks = intel_gt_get_l3bank_count(&i915->gt); > + > + if (copy_to_user(u64_to_user_ptr(query_item->data_ptr), > + &banks, sizeof(banks))) > + return -EFAULT; > + > + return sizeof(banks); > +} > + > static int (* const i915_query_funcs[])(struct drm_i915_private *dev_priv, > struct drm_i915_query_item *query_item) = { > query_topology_info, > @@ -509,6 +530,7 @@ static int (* const i915_query_funcs[])(struct drm_i915_private *dev_priv, > query_perf_config, > query_memregion_info, > query_hwconfig_table, > + query_l3banks, > }; > > int i915_query_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index eb13c601d680..e9ba88fe3db7 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -3099,6 +3099,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > #define GEN10_MIRROR_FUSE3 _MMIO(0x9118) > #define GEN10_L3BANK_PAIR_COUNT 4 > #define GEN10_L3BANK_MASK 0x0F > +#define GEN12_GT_L3_MODE_MASK 0xFF > > #define GEN8_EU_DISABLE0 _MMIO(0x9134) > #define GEN8_EU_DIS0_S0_MASK 0xffffff > diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h > index 87d369cae22a..20d18cca5066 100644 > --- a/include/uapi/drm/i915_drm.h > +++ b/include/uapi/drm/i915_drm.h > @@ -2234,6 +2234,7 @@ struct drm_i915_query_item { > #define DRM_I915_QUERY_PERF_CONFIG 3 > #define DRM_I915_QUERY_MEMORY_REGIONS 4 > #define DRM_I915_QUERY_HWCONFIG_TABLE 5 > +#define DRM_I915_QUERY_L3_BANK_COUNT 6 > /* Must be kept compact -- no holes and well documented */ > > /** > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx