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.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2120DC4338F for ; Mon, 26 Jul 2021 10:23:06 +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 E306F60F55 for ; Mon, 26 Jul 2021 10:23:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E306F60F55 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FDED6F63D; Mon, 26 Jul 2021 10:23:05 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9B63E6F5D5; Mon, 26 Jul 2021 10:23:03 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10056"; a="191793662" X-IronPort-AV: E=Sophos;i="5.84,270,1620716400"; d="scan'208";a="191793662" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jul 2021 03:23:03 -0700 X-IronPort-AV: E=Sophos;i="5.84,270,1620716400"; d="scan'208";a="417012663" Received: from dechasso-mobl3.amr.corp.intel.com (HELO intel.com) ([10.212.115.115]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jul 2021 03:23:01 -0700 Date: Mon, 26 Jul 2021 06:22:59 -0400 From: Rodrigo Vivi To: Lucas De Marchi Message-ID: References: <20210724001114.249295-1-lucas.demarchi@intel.com> <20210724001114.249295-25-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210724001114.249295-25-lucas.demarchi@intel.com> Subject: Re: [Intel-gfx] [PATCH 24/30] drm/i915: rename CNL references in intel_dram.c 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: Daniel Vetter , intel-gfx@lists.freedesktop.org, 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 Fri, Jul 23, 2021 at 05:11:08PM -0700, Lucas De Marchi wrote: > With the removal of CNL, let's consider ICL as the first platform using > those constants. > > Signed-off-by: Lucas De Marchi Reviewed-by: Rodrigo Vivi > --- > drivers/gpu/drm/i915/i915_reg.h | 24 +++++++++++------------ > drivers/gpu/drm/i915/intel_dram.c | 32 +++++++++++++++---------------- > 2 files changed, 28 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index f032a4c8b26d..8782d1723254 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -11082,18 +11082,18 @@ enum skl_power_gate { > #define SKL_DRAM_RANK_1 (0x0 << 10) > #define SKL_DRAM_RANK_2 (0x1 << 10) > #define SKL_DRAM_RANK_MASK (0x1 << 10) > -#define CNL_DRAM_SIZE_MASK 0x7F > -#define CNL_DRAM_WIDTH_MASK (0x3 << 7) > -#define CNL_DRAM_WIDTH_SHIFT 7 > -#define CNL_DRAM_WIDTH_X8 (0x0 << 7) > -#define CNL_DRAM_WIDTH_X16 (0x1 << 7) > -#define CNL_DRAM_WIDTH_X32 (0x2 << 7) > -#define CNL_DRAM_RANK_MASK (0x3 << 9) > -#define CNL_DRAM_RANK_SHIFT 9 > -#define CNL_DRAM_RANK_1 (0x0 << 9) > -#define CNL_DRAM_RANK_2 (0x1 << 9) > -#define CNL_DRAM_RANK_3 (0x2 << 9) > -#define CNL_DRAM_RANK_4 (0x3 << 9) > +#define ICL_DRAM_SIZE_MASK 0x7F > +#define ICL_DRAM_WIDTH_MASK (0x3 << 7) > +#define ICL_DRAM_WIDTH_SHIFT 7 > +#define ICL_DRAM_WIDTH_X8 (0x0 << 7) > +#define ICL_DRAM_WIDTH_X16 (0x1 << 7) > +#define ICL_DRAM_WIDTH_X32 (0x2 << 7) > +#define ICL_DRAM_RANK_MASK (0x3 << 9) > +#define ICL_DRAM_RANK_SHIFT 9 > +#define ICL_DRAM_RANK_1 (0x0 << 9) > +#define ICL_DRAM_RANK_2 (0x1 << 9) > +#define ICL_DRAM_RANK_3 (0x2 << 9) > +#define ICL_DRAM_RANK_4 (0x3 << 9) > > #define SA_PERF_STATUS_0_0_0_MCHBAR_PC _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5918) > #define DG1_QCLK_RATIO_MASK REG_GENMASK(9, 2) > diff --git a/drivers/gpu/drm/i915/intel_dram.c b/drivers/gpu/drm/i915/intel_dram.c > index 9675bb94b70b..34d6cf440352 100644 > --- a/drivers/gpu/drm/i915/intel_dram.c > +++ b/drivers/gpu/drm/i915/intel_dram.c > @@ -77,21 +77,21 @@ static int skl_get_dimm_ranks(u16 val) > } > > /* Returns total Gb for the whole DIMM */ > -static int cnl_get_dimm_size(u16 val) > +static int icl_get_dimm_size(u16 val) > { > - return (val & CNL_DRAM_SIZE_MASK) * 8 / 2; > + return (val & ICL_DRAM_SIZE_MASK) * 8 / 2; > } > > -static int cnl_get_dimm_width(u16 val) > +static int icl_get_dimm_width(u16 val) > { > - if (cnl_get_dimm_size(val) == 0) > + if (icl_get_dimm_size(val) == 0) > return 0; > > - switch (val & CNL_DRAM_WIDTH_MASK) { > - case CNL_DRAM_WIDTH_X8: > - case CNL_DRAM_WIDTH_X16: > - case CNL_DRAM_WIDTH_X32: > - val = (val & CNL_DRAM_WIDTH_MASK) >> CNL_DRAM_WIDTH_SHIFT; > + switch (val & ICL_DRAM_WIDTH_MASK) { > + case ICL_DRAM_WIDTH_X8: > + case ICL_DRAM_WIDTH_X16: > + case ICL_DRAM_WIDTH_X32: > + val = (val & ICL_DRAM_WIDTH_MASK) >> ICL_DRAM_WIDTH_SHIFT; > return 8 << val; > default: > MISSING_CASE(val); > @@ -99,12 +99,12 @@ static int cnl_get_dimm_width(u16 val) > } > } > > -static int cnl_get_dimm_ranks(u16 val) > +static int icl_get_dimm_ranks(u16 val) > { > - if (cnl_get_dimm_size(val) == 0) > + if (icl_get_dimm_size(val) == 0) > return 0; > > - val = (val & CNL_DRAM_RANK_MASK) >> CNL_DRAM_RANK_SHIFT; > + val = (val & ICL_DRAM_RANK_MASK) >> ICL_DRAM_RANK_SHIFT; > > return val + 1; > } > @@ -121,10 +121,10 @@ skl_dram_get_dimm_info(struct drm_i915_private *i915, > struct dram_dimm_info *dimm, > int channel, char dimm_name, u16 val) > { > - if (GRAPHICS_VER(i915) >= 10) { > - dimm->size = cnl_get_dimm_size(val); > - dimm->width = cnl_get_dimm_width(val); > - dimm->ranks = cnl_get_dimm_ranks(val); > + if (GRAPHICS_VER(i915) >= 11) { > + dimm->size = icl_get_dimm_size(val); > + dimm->width = icl_get_dimm_width(val); > + dimm->ranks = icl_get_dimm_ranks(val); > } else { > dimm->size = skl_get_dimm_size(val); > dimm->width = skl_get_dimm_width(val); > -- > 2.31.1 > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx