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 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 0B431C43217 for ; Tue, 30 Nov 2021 11:09:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F0D26E140; Tue, 30 Nov 2021 11:09:56 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 737866E140 for ; Tue, 30 Nov 2021 11:09:54 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10183"; a="322435639" X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="322435639" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2021 03:09:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,275,1631602800"; d="scan'208";a="575798881" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga004.fm.intel.com with ESMTP; 30 Nov 2021 03:09:54 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 03:09:53 -0800 Received: from fmsmsx611.amr.corp.intel.com ([10.18.126.91]) by fmsmsx611.amr.corp.intel.com ([10.18.126.91]) with mapi id 15.01.2308.020; Tue, 30 Nov 2021 03:09:53 -0800 From: "Srivatsa, Anusha" To: Jani Nikula , "intel-gfx@lists.freedesktop.org" , "Tvrtko Ursulin" , "Syrjala, Ville" , "Vivi, Rodrigo" , "Joonas Lahtinen" Thread-Topic: [v2 3/3] drm/i915/rpl-s: Enable guc submission by default Thread-Index: AQHX3aXingb3zzO9C0y4iO8YFfFmH6wP2agAgAwWnoA= Date: Tue, 30 Nov 2021 11:09:53 +0000 Message-ID: References: <20211120002921.1939452-1-anusha.srivatsa@intel.com> <20211120002921.1939452-4-anusha.srivatsa@intel.com> <87czmso6l7.fsf@intel.com> In-Reply-To: <87czmso6l7.fsf@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.200.16 dlp-product: dlpe-windows dlp-reaction: no-action x-originating-ip: [10.223.10.1] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [Intel-gfx] [v2 3/3] drm/i915/rpl-s: Enable guc submission by default 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" > -----Original Message----- > From: Jani Nikula > Sent: Monday, November 22, 2021 3:28 PM > To: Srivatsa, Anusha ; intel- > gfx@lists.freedesktop.org; Tvrtko Ursulin ; > Syrjala, Ville ; Vivi, Rodrigo > ; Joonas Lahtinen > > Cc: Srivatsa, Anusha ; Dhanavanthri, Swathi > > Subject: Re: [v2 3/3] drm/i915/rpl-s: Enable guc submission by default >=20 > On Fri, 19 Nov 2021, Anusha Srivatsa wrote: > > Though, RPL-S is defined as subplatform of ADL-S, unlike ADL-S, it has > > GuC submission by default. > > > > v2: Remove extra parenthesis (Jani) > > > > Cc: Jani Nikula > > Cc: Swathi Dhanavanthri > > Signed-off-by: Anusha Srivatsa > > --- > > drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > > b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > > index 2fef3b0bbe95..6aa843a1c25f 100644 > > --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c > > +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c > > @@ -35,7 +35,7 @@ static void uc_expand_default_options(struct intel_uc > *uc) > > } > > > > /* Intermediate platforms are HuC authentication only */ > > - if (IS_ALDERLAKE_S(i915)) { > > + if (IS_ALDERLAKE_S(i915) && !IS_RAPTORLAKE_S(i915)) { >=20 > I know I looked through the previous version, but I only realized this no= w. > The above just feels wrong. Like, if it's ADL-S it obviously can't be RPL= -S, so > why the check. >=20 > We've had this type of thing before when IS_VALLEYVIEW() used to mean > VLV || CHV, and you'd have these really confusing checks: >=20 > if (IS_VALLEYVIEW() && !IS_CHERRYVIEW()) >=20 > We had to change that later on, and it was pretty annoying. >=20 > I'm really sorry I didn't spot this before, but I firmly believe adding a= platform > check macro IS_RAPTORLAKE_S() as a subplatform check is the wrong thing > to do. >=20 > I think there are maybe three options: >=20 > 1) Add RPL-S as a full blown platform of its own. Convert > IS_ALDERLAKE_S() checks to IS_ALDERLAKE_S() || IS_RAPTORLAKE_S(). If > we think there's going to be more differences than just the guc > submission, this is the way to go. No. there is nothing else different between the 2 platforms. > 2) Add RPL-S as a subplatform of ADL-S like here, but then don't add a > platform macro IS_RAPTORLAKE_S(). Make the check something that > conveys the subplatform idea. See all the users of IS_SUBPLATFORM() > in i915_drv.h; for example IS_DG2_G10(). It's obvious it's a DG2 but > subtype G10. So maybe IS_ADLS_RPLS(), I don't know. I am trying to understand what this will serve. The above check will change= from=20 (IS_ALDERLAKE_S(i915) && !IS_RAPTORLAKE_S(i915) to (IS_ALDERLAKE_S(i915) &&= !IS_ADLS_RPLS(i915). Agreed it will make the fact that RPLS is subplatform= of ADLS a lot clear. Is that what you are suggesting? Anusha > 3) Add RPL-S PCI IDs as ADL-S with separate device info, but add a > feature flag for the guc submission default. Then RPL-S does not > exist as a platform or subplatform in code, rather as ADL-S, but the > difference is recorded via flags. >=20 >=20 > BR, > Jani. >=20 >=20 >=20 >=20 > > i915->params.enable_guc =3D ENABLE_GUC_LOAD_HUC; > > return; > > } >=20 > -- > Jani Nikula, Intel Open Source Graphics Center