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 4B67BFA373D for ; Fri, 21 Oct 2022 16:07:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E8BB10E1E3; Fri, 21 Oct 2022 16:07:08 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 30BBA10E3BF; Fri, 21 Oct 2022 16:07:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666368422; x=1697904422; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=TaZg7Hlx4DAQt5/TJPyeBdMpzWqV5J1vnU9jWFWSsxQ=; b=l8oqhD5VHO787z1+TiLxxbEVtKfik/yK241iUQToEGJmN48woT2GmUJi 2pYo/GCYR00Rmc4TVMLDM6lQKJISXB8u6g9DOq7s5oCe9FI50jjvQVSBE mnCwsMKWBXnqTtr4UhDsV0dHIvMi5jlP5T8gNe0mGZb64+f+J++fJYxSj jJ9tK96ijBqdeOfwc5MnhxzXK69wtT+bzwWiBwTuWDQkjgfexBG5izo/H ma+RT9W9/5dnzZ+h6zKnAiF2uOJ7vnuVdDHYSCJ0LB65G/RSO310NGBej T9O4RwG8AaKaiBkLHL0Fx2VLs1FAdGXhtbBr05wKCDYzR9XAesUpMJml4 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10507"; a="308133936" X-IronPort-AV: E=Sophos;i="5.95,202,1661842800"; d="scan'208";a="308133936" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2022 09:02:54 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10507"; a="773100145" X-IronPort-AV: E=Sophos;i="5.95,202,1661842800"; d="scan'208";a="773100145" Received: from adixit-mobl.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.255.230.194]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2022 09:02:54 -0700 Date: Fri, 21 Oct 2022 09:02:03 -0700 Message-ID: <87zgdpp3lw.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: intel-gfx@lists.freedesktop.org In-Reply-To: <20221019233721.3270601-4-ashutosh.dixit@intel.com> References: <20221019233721.3270601-1-ashutosh.dixit@intel.com> <20221019233721.3270601-4-ashutosh.dixit@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Subject: Re: [Intel-gfx] [PATCH 3/5] drm/i915/mtl: Modify CAGF functions for MTL 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: dri-devel@lists.freedesktop.org, Rodrigo Vivi Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 19 Oct 2022 16:37:19 -0700, Ashutosh Dixit wrote: > > From: Badal Nilawar > > Update CAGF functions for MTL to get actual resolved frequency of 3D and > SAMedia. > > v2: Update MTL_MIRROR_TARGET_WP1 position/formatting (MattR) > Move MTL branches in cagf functions to top (MattR) > Fix commit message (Andi) > v3: Added comment about registers not needing forcewake for Gen12+ and > returning 0 freq in RC6 > v4: Use REG_FIELD_GET and uncore (Rodrigo) > > Bspec: 66300 Reviewed-by: Ashutosh Dixit > > Signed-off-by: Ashutosh Dixit > Signed-off-by: Badal Nilawar > --- > drivers/gpu/drm/i915/gt/intel_gt_regs.h | 4 ++++ > drivers/gpu/drm/i915/gt/intel_rps.c | 12 ++++++++++-- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h > index f8c4f758ac0b1..d8dbd0ac3b064 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h > @@ -21,6 +21,10 @@ > */ > #define PERF_REG(offset) _MMIO(offset) > > +/* MTL workpoint reg to get core C state and actual freq of 3D, SAMedia */ > +#define MTL_MIRROR_TARGET_WP1 _MMIO(0xc60) > +#define MTL_CAGF_MASK REG_GENMASK(8, 0) > + > /* RPM unit config (Gen8+) */ > #define RPM_CONFIG0 _MMIO(0xd00) > #define GEN9_RPM_CONFIG0_CRYSTAL_CLOCK_FREQ_SHIFT 3 > diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c > index da6b969f554b6..63cc7c538401e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_rps.c > +++ b/drivers/gpu/drm/i915/gt/intel_rps.c > @@ -2093,7 +2093,9 @@ u32 intel_rps_get_cagf(struct intel_rps *rps, u32 rpstat) > struct drm_i915_private *i915 = rps_to_i915(rps); > u32 cagf; > > - if (GRAPHICS_VER(i915) >= 12) > + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70)) > + cagf = REG_FIELD_GET(MTL_CAGF_MASK, rpstat); > + else if (GRAPHICS_VER(i915) >= 12) > cagf = REG_FIELD_GET(GEN12_CAGF_MASK, rpstat); > else if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) > cagf = REG_FIELD_GET(RPE_MASK, rpstat); > @@ -2115,7 +2117,13 @@ static u32 read_cagf(struct intel_rps *rps) > struct intel_uncore *uncore = rps_to_uncore(rps); > u32 freq; > > - if (GRAPHICS_VER(i915) >= 12) { > + /* > + * For Gen12+ reading freq from HW does not need a forcewake and > + * registers will return 0 freq when GT is in RC6 > + */ > + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 70)) { > + freq = intel_uncore_read(uncore, MTL_MIRROR_TARGET_WP1); > + } else if (GRAPHICS_VER(i915) >= 12) { > freq = intel_uncore_read(uncore, GEN12_RPSTAT1); > } else if (IS_VALLEYVIEW(i915) || IS_CHERRYVIEW(i915)) { > vlv_punit_get(i915); > -- > 2.38.0 >