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 93874C07E96 for ; Thu, 15 Jul 2021 06:32:07 +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 5408661260 for ; Thu, 15 Jul 2021 06:32:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5408661260 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 D946E6E52E; Thu, 15 Jul 2021 06:32:06 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 117276E52E for ; Thu, 15 Jul 2021 06:32:06 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10045"; a="190163272" X-IronPort-AV: E=Sophos;i="5.84,240,1620716400"; d="scan'208";a="190163272" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2021 23:32:04 -0700 X-IronPort-AV: E=Sophos;i="5.84,240,1620716400"; d="scan'208";a="494432989" Received: from thihoan5-mobl.amr.corp.intel.com (HELO ldmartin-desk2) ([10.209.66.46]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2021 23:32:03 -0700 Date: Wed, 14 Jul 2021 23:32:01 -0700 From: Lucas De Marchi To: Anusha Srivatsa Message-ID: <20210715063201.pjr2ymtexzylyuio@ldmartin-desk2> References: <20210715050507.31176-1-anusha.srivatsa@intel.com> <20210715050507.31176-2-anusha.srivatsa@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210715050507.31176-2-anusha.srivatsa@intel.com> Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/dmc: Change intel_get_stepping_info() 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: intel-gfx@lists.freedesktop.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Jul 14, 2021 at 10:05:07PM -0700, Anusha Srivatsa wrote: >Lets use RUNTIME_INFO->step since all platforms now have their >stepping info in intel_step.c. This makes intel_get_stepping_info() >a lot simpler. > >Cc: Lucas De Marchi >Signed-off-by: Anusha Srivatsa Given the patches from Matt were applied: Reviewed-by: Lucas De Marchi thanks Lucas De Marchi >--- > drivers/gpu/drm/i915/display/intel_dmc.c | 50 ++++-------------------- > 1 file changed, 8 insertions(+), 42 deletions(-) > >diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c >index f8789d4543bf..1f6c32932331 100644 >--- a/drivers/gpu/drm/i915/display/intel_dmc.c >+++ b/drivers/gpu/drm/i915/display/intel_dmc.c >@@ -247,50 +247,15 @@ bool intel_dmc_has_payload(struct drm_i915_private *i915) > return i915->dmc.dmc_info[DMC_FW_MAIN].payload; > } > >-static const struct stepping_info skl_stepping_info[] = { >- {'A', '0'}, {'B', '0'}, {'C', '0'}, >- {'D', '0'}, {'E', '0'}, {'F', '0'}, >- {'G', '0'}, {'H', '0'}, {'I', '0'}, >- {'J', '0'}, {'K', '0'} >-}; >- >-static const struct stepping_info bxt_stepping_info[] = { >- {'A', '0'}, {'A', '1'}, {'A', '2'}, >- {'B', '0'}, {'B', '1'}, {'B', '2'} >-}; >- >-static const struct stepping_info icl_stepping_info[] = { >- {'A', '0'}, {'A', '1'}, {'A', '2'}, >- {'B', '0'}, {'B', '2'}, >- {'C', '0'} >-}; >- >-static const struct stepping_info no_stepping_info = { '*', '*' }; >- > static const struct stepping_info * >-intel_get_stepping_info(struct drm_i915_private *dev_priv) >+intel_get_stepping_info(struct drm_i915_private *i915, >+ struct stepping_info *si) > { >- const struct stepping_info *si; >- unsigned int size; >- >- if (IS_ICELAKE(dev_priv)) { >- size = ARRAY_SIZE(icl_stepping_info); >- si = icl_stepping_info; >- } else if (IS_SKYLAKE(dev_priv)) { >- size = ARRAY_SIZE(skl_stepping_info); >- si = skl_stepping_info; >- } else if (IS_BROXTON(dev_priv)) { >- size = ARRAY_SIZE(bxt_stepping_info); >- si = bxt_stepping_info; >- } else { >- size = 0; >- si = NULL; >- } >- >- if (INTEL_REVID(dev_priv) < size) >- return si + INTEL_REVID(dev_priv); >+ const char *step_name = intel_step_name(RUNTIME_INFO(i915)->step.display_step); > >- return &no_stepping_info; >+ si->stepping = step_name[0]; >+ si->substepping = step_name[1]; >+ return si; > } > > static void gen9_set_dc_state_debugmask(struct drm_i915_private *dev_priv) >@@ -616,7 +581,8 @@ static void parse_dmc_fw(struct drm_i915_private *dev_priv, > struct intel_package_header *package_header; > struct intel_dmc_header_base *dmc_header; > struct intel_dmc *dmc = &dev_priv->dmc; >- const struct stepping_info *si = intel_get_stepping_info(dev_priv); >+ struct stepping_info display_info = { '*', '*'}; >+ const struct stepping_info *si = intel_get_stepping_info(dev_priv, &display_info); > u32 readcount = 0; > u32 r, offset; > int id; >-- >2.32.0 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx