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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 C582AC07E95 for ; Tue, 13 Jul 2021 16:56:31 +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 8DA116101E for ; Tue, 13 Jul 2021 16:56:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DA116101E 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 367FA89E1B; Tue, 13 Jul 2021 16:56:31 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id C514889E1B for ; Tue, 13 Jul 2021 16:56:29 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10044"; a="210249170" X-IronPort-AV: E=Sophos;i="5.84,236,1620716400"; d="scan'208";a="210249170" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jul 2021 09:56:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,236,1620716400"; d="scan'208";a="430117812" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga002.jf.intel.com with ESMTP; 13 Jul 2021 09:56:27 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) 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.2242.10; Tue, 13 Jul 2021 09:56:27 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.10; Tue, 13 Jul 2021 09:56:26 -0700 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.2242.010; Tue, 13 Jul 2021 09:56:26 -0700 From: "Srivatsa, Anusha" To: "Roper, Matthew D" , "intel-gfx@lists.freedesktop.org" Thread-Topic: [PATCH v3 08/12] drm/i915/jsl_ehl: Use revid->stepping tables Thread-Index: AQHXeAJBqX/MznClt0KupI+AL4W7/qtBH+vQ Date: Tue, 13 Jul 2021 16:56:26 +0000 Message-ID: References: <69cca14862c94a84987fbf53c727beac@intel.com> <20210713161444.3334530-1-matthew.d.roper@intel.com> In-Reply-To: <20210713161444.3334530-1-matthew.d.roper@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.5.1.3 dlp-product: dlpe-windows dlp-reaction: no-action x-originating-ip: [10.22.254.132] MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH v3 08/12] drm/i915/jsl_ehl: Use revid->stepping tables 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" > -----Original Message----- > From: Roper, Matthew D > Sent: Tuesday, July 13, 2021 9:15 AM > To: intel-gfx@lists.freedesktop.org > Cc: Srivatsa, Anusha ; Roper, Matthew D > > Subject: [PATCH v3 08/12] drm/i915/jsl_ehl: Use revid->stepping tables > > Switch JSL/EHL to use a revid->stepping table as we're trying to do on all > platforms going forward. > > v2: > - Use COMMON_STEPPING(). (Anusha) > > Bspec: 29153 > Cc: Anusha Srivatsa > Signed-off-by: Matt Roper Reviewed-by: Anusha Srivatsa > --- > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- > drivers/gpu/drm/i915/i915_drv.h | 9 ++++----- > drivers/gpu/drm/i915/intel_step.c | 8 ++++++++ > 4 files changed, 14 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > index 882bfd499e55..dfc31b682848 100644 > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > @@ -2674,7 +2674,7 @@ static bool > ehl_combo_pll_div_frac_wa_needed(struct drm_i915_private *i915) { > return ((IS_PLATFORM(i915, INTEL_ELKHARTLAKE) && > - IS_JSL_EHL_REVID(i915, EHL_REVID_B0, REVID_FOREVER)) > || > + IS_JSL_EHL_DISPLAY_STEP(i915, STEP_B0, STEP_FOREVER)) > || > IS_TIGERLAKE(i915) || IS_ALDERLAKE_P(i915)) && > i915->dpll.ref_clks.nssc == 38400; > } > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c > b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index e2d8acb8c1c9..4c0c15bbdac2 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -1043,7 +1043,7 @@ icl_gt_workarounds_init(struct drm_i915_private > *i915, struct i915_wa_list *wal) > > /* Wa_1607087056:icl,ehl,jsl */ > if (IS_ICELAKE(i915) || > - IS_JSL_EHL_REVID(i915, EHL_REVID_A0, EHL_REVID_A0)) > + IS_JSL_EHL_GT_STEP(i915, STEP_A0, STEP_A0)) > wa_write_or(wal, > SLICE_UNIT_LEVEL_CLKGATE, > L3_CLKGATE_DIS | L3_CR2X_CLKGATE_DIS); diff -- > git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index d4f705f06c73..b3ce2b73a143 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1532,11 +1532,10 @@ IS_SUBPLATFORM(const struct drm_i915_private > *i915, #define IS_ICL_GT_STEP(p, since, until) \ > (IS_ICELAKE(p) && IS_GT_STEP(p, since, until)) > > -#define EHL_REVID_A0 0x0 > -#define EHL_REVID_B0 0x1 > - > -#define IS_JSL_EHL_REVID(p, since, until) \ > - (IS_JSL_EHL(p) && IS_REVID(p, since, until)) > +#define IS_JSL_EHL_GT_STEP(p, since, until) \ > + (IS_JSL_EHL(p) && IS_GT_STEP(p, since, until)) #define > +IS_JSL_EHL_DISPLAY_STEP(p, since, until) \ > + (IS_JSL_EHL(p) && IS_DISPLAY_STEP(p, since, until)) > > #define IS_TGL_DISPLAY_STEP(__i915, since, until) \ > (IS_TIGERLAKE(__i915) && \ > diff --git a/drivers/gpu/drm/i915/intel_step.c > b/drivers/gpu/drm/i915/intel_step.c > index f8be464d1179..868606f8139f 100644 > --- a/drivers/gpu/drm/i915/intel_step.c > +++ b/drivers/gpu/drm/i915/intel_step.c > @@ -57,6 +57,11 @@ static const struct intel_step_info icl_revids[] = { > [7] = { COMMON_STEPPING(D0) }, > }; > > +static const struct intel_step_info jsl_ehl_revids[] = { > + [0] = { COMMON_STEPPING(A0) }, > + [1] = { COMMON_STEPPING(B0) }, > +}; > + > static const struct intel_step_info tgl_uy_revids[] = { > [0] = { .gt_step = STEP_A0, .display_step = STEP_A0 }, > [1] = { .gt_step = STEP_B0, .display_step = STEP_C0 }, @@ -104,6 > +109,9 @@ void intel_step_init(struct drm_i915_private *i915) > } else if (IS_TIGERLAKE(i915)) { > revids = tgl_revids; > size = ARRAY_SIZE(tgl_revids); > + } else if (IS_JSL_EHL(i915)) { > + revids = jsl_ehl_revids; > + size = ARRAY_SIZE(jsl_ehl_revids); > } else if (IS_ICELAKE(i915)) { > revids = icl_revids; > size = ARRAY_SIZE(icl_revids); > -- > 2.25.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx