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.5 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 3571EC07E95 for ; Sat, 10 Jul 2021 14:27:17 +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 E0EC3611C1 for ; Sat, 10 Jul 2021 14:27:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E0EC3611C1 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 5ABA16EB21; Sat, 10 Jul 2021 14:27:16 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id C970C6EB21; Sat, 10 Jul 2021 14:27:15 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10041"; a="209870771" X-IronPort-AV: E=Sophos;i="5.84,229,1620716400"; d="scan'208";a="209870771" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2021 07:27:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,229,1620716400"; d="scan'208";a="424920655" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by fmsmga007.fm.intel.com with ESMTP; 10 Jul 2021 07:27:11 -0700 Received: from [10.249.151.15] (mwajdecz-MOBL.ger.corp.intel.com [10.249.151.15]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 16AERApB010892; Sat, 10 Jul 2021 15:27:10 +0100 To: Vinay Belgaumkar , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org References: <20210710012026.19705-1-vinay.belgaumkar@intel.com> <20210710012026.19705-3-vinay.belgaumkar@intel.com> From: Michal Wajdeczko Message-ID: <1e1debcc-3439-10ac-6c58-8be5f56340da@intel.com> Date: Sat, 10 Jul 2021 16:27:10 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210710012026.19705-3-vinay.belgaumkar@intel.com> Content-Language: en-US Subject: Re: [Intel-gfx] [PATCH 02/16] drm/i915/guc/slpc: Initial definitions for slpc 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi Vinay, On 10.07.2021 03:20, Vinay Belgaumkar wrote: > Add macros to check for slpc support. This feature is currently supported > for gen12+ and enabled whenever guc submission is enabled/selected. please try to use consistent names across all patches: s/slpc/SLPC s/gen12/Gen12 s/guc/GuC > > Signed-off-by: Vinay Belgaumkar > Signed-off-by: Sundaresan Sujaritha > Signed-off-by: Daniele Ceraolo Spurio > --- > drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 + > drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 ++ > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 21 +++++++++++++++++++ > .../gpu/drm/i915/gt/uc/intel_guc_submission.h | 16 ++++++++++++++ > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 6 ++++-- > drivers/gpu/drm/i915/gt/uc/intel_uc.h | 1 + > 6 files changed, 45 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c > index 979128e28372..b9a809f2d221 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c > @@ -157,6 +157,7 @@ void intel_guc_init_early(struct intel_guc *guc) > intel_guc_ct_init_early(&guc->ct); > intel_guc_log_init_early(&guc->log); > intel_guc_submission_init_early(guc); > + intel_guc_slpc_init_early(guc); > > mutex_init(&guc->send_mutex); > spin_lock_init(&guc->irq_lock); > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > index 5d94cf482516..e5a456918b88 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > @@ -57,6 +57,8 @@ struct intel_guc { > > bool submission_supported; > bool submission_selected; > + bool slpc_supported; > + bool slpc_selected; > > struct i915_vma *ads_vma; > struct __guc_ads_blob *ads_blob; > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > index 9c102bf0c8e3..e2644a05f298 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -2351,6 +2351,27 @@ void intel_guc_submission_init_early(struct intel_guc *guc) > guc->submission_selected = __guc_submission_selected(guc); > } > > +static bool __guc_slpc_supported(struct intel_guc *guc) hmm, easy to confuse with intel_guc_slpc_is_supported, so maybe: __detect_slpc_supported() (yes, I know you were following code above) > +{ > + /* GuC slpc is unavailable for pre-Gen12 */ s/slpc/SLPC > + return guc->submission_supported && > + GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12; > +} > + > +static bool __guc_slpc_selected(struct intel_guc *guc) > +{ > + if (!intel_guc_slpc_is_supported(guc)) > + return false; > + > + return guc->submission_selected; > +} > + > +void intel_guc_slpc_init_early(struct intel_guc *guc) > +{ > + guc->slpc_supported = __guc_slpc_supported(guc); > + guc->slpc_selected = __guc_slpc_selected(guc); > +} in patch 4/16 you are introducing intel_guc_slpc.c|h so to have proper encapsulation better to define this function as void intel_guc_slpc_init_early(struct intel_guc_slpc *slpc) { } and move it to intel_guc_slpc.c > + > static inline struct intel_context * > g2h_context_lookup(struct intel_guc *guc, u32 desc_idx) > { > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h > index be767eb6ff71..7ae5fd052faf 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h > @@ -13,6 +13,7 @@ > struct drm_printer; > struct intel_engine_cs; > > +void intel_guc_slpc_init_early(struct intel_guc *guc); it really does not belong to this .h > void intel_guc_submission_init_early(struct intel_guc *guc); > int intel_guc_submission_init(struct intel_guc *guc); > void intel_guc_submission_enable(struct intel_guc *guc); > @@ -50,4 +51,19 @@ static inline bool intel_guc_submission_is_used(struct intel_guc *guc) > return intel_guc_is_used(guc) && intel_guc_submission_is_wanted(guc); > } > > +static inline bool intel_guc_slpc_is_supported(struct intel_guc *guc) > +{ > + return guc->slpc_supported; > +} > + > +static inline bool intel_guc_slpc_is_wanted(struct intel_guc *guc) > +{ > + return guc->slpc_selected; > +} > + > +static inline bool intel_guc_slpc_is_used(struct intel_guc *guc) > +{ > + return intel_guc_submission_is_used(guc) && intel_guc_slpc_is_wanted(guc); > +} did you try to define them in intel_guc_slpc.h ? note that to avoid circular dependencies you can define slpc struct in intel_guc_slpc_types.h and then in intel_guc.h: #include "intel_guc_slpc_types.h" instead of intel_guc_slpc.h in intel_guc_slpc.h: #include "intel_guc.h" #include "intel_guc_slpc_types.h" #include "intel_guc_submission.h" > + > #endif > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > index 61be0aa81492..dca5f6d0641b 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > @@ -76,16 +76,18 @@ static void __confirm_options(struct intel_uc *uc) > struct drm_i915_private *i915 = uc_to_gt(uc)->i915; > > drm_dbg(&i915->drm, > - "enable_guc=%d (guc:%s submission:%s huc:%s)\n", > + "enable_guc=%d (guc:%s submission:%s huc:%s slpc:%s)\n", > i915->params.enable_guc, > yesno(intel_uc_wants_guc(uc)), > yesno(intel_uc_wants_guc_submission(uc)), > - yesno(intel_uc_wants_huc(uc))); > + yesno(intel_uc_wants_huc(uc)), > + yesno(intel_uc_wants_guc_slpc(uc))); > > if (i915->params.enable_guc == 0) { > GEM_BUG_ON(intel_uc_wants_guc(uc)); > GEM_BUG_ON(intel_uc_wants_guc_submission(uc)); > GEM_BUG_ON(intel_uc_wants_huc(uc)); > + GEM_BUG_ON(intel_uc_wants_guc_slpc(uc)); > return; > } > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h > index e2da2b6e76e1..38e465fd8a0c 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h > @@ -83,6 +83,7 @@ __uc_state_checker(x, func, uses, used) > uc_state_checkers(guc, guc); > uc_state_checkers(huc, huc); > uc_state_checkers(guc, guc_submission); > +uc_state_checkers(guc, guc_slpc); > > #undef uc_state_checkers > #undef __uc_state_checker > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx