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=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 25541C4363A for ; Tue, 6 Oct 2020 01:24:52 +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 C06A62076B for ; Tue, 6 Oct 2020 01:24:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C06A62076B 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 2908389D81; Tue, 6 Oct 2020 01:24:51 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id E7EEC89D81 for ; Tue, 6 Oct 2020 01:24:49 +0000 (UTC) IronPort-SDR: DHNdxWhRZQ1GmWdthqJnNm/YFNO/9TR5PHmECpWebePSyMqdLmo/U5xxS2Uw7GK4C9BGMumYvC aokRlVjprUhw== X-IronPort-AV: E=McAfee;i="6000,8403,9765"; a="152066235" X-IronPort-AV: E=Sophos;i="5.77,341,1596524400"; d="scan'208";a="152066235" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2020 18:24:42 -0700 IronPort-SDR: cJb/iwOE2RqJRmxQwmJSAEHS0DejfYqZpH+FbC/mJbP9y8WVoxd4bQpo6KS+Kql5BkWVAQ0JVa fq9QfkSDLb/A== X-IronPort-AV: E=Sophos;i="5.77,341,1596524400"; d="scan'208";a="526970434" Received: from ideak-desk.fi.intel.com ([10.237.68.141]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2020 18:24:40 -0700 Date: Tue, 6 Oct 2020 04:24:36 +0300 From: Imre Deak To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: <20201006012436.GF1378377@ideak-desk.fi.intel.com> References: <20201003001846.1271151-1-imre.deak@intel.com> <20201003001846.1271151-2-imre.deak@intel.com> <20201005200819.GJ6112@intel.com> <20201005202605.GA1378377@ideak-desk.fi.intel.com> <20201005233758.GP6112@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201005233758.GP6112@intel.com> Subject: Re: [Intel-gfx] [PATCH 1/5] drm/i915/skl: Work around incorrect BIOS WRPLL PDIV programming 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: , Reply-To: imre.deak@intel.com Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Oct 06, 2020 at 02:37:58AM +0300, Ville Syrj=E4l=E4 wrote: > On Mon, Oct 05, 2020 at 11:26:05PM +0300, Imre Deak wrote: > > On Mon, Oct 05, 2020 at 11:08:19PM +0300, Ville Syrj=E4l=E4 wrote: > > > On Sat, Oct 03, 2020 at 03:18:42AM +0300, Imre Deak wrote: > > > > The BIOS of at least one ASUS-Z170M system with an SKL I have progr= ams > > > > the 101b WRPLL PDIV divider value, which is the encoding for PDIV= =3D7 with > > > > bit#0 incorrectly set. > > > > = > > > > This happens with the > > > > = > > > > "3840x2160": 30 262750 3840 3888 3920 4000 2160 2163 2168 2191 0x48= 0x9 > > > > = > > > > HDMI mode (scaled from a 1024x768 src fb) set by BIOS and the > > > > = > > > > ref_clock=3D24000, dco_integer=3D383, dco_fraction=3D5802, pdiv=3D7= , qdiv=3D1, kdiv=3D1 > > > > = > > > > WRPLL parameters (assuming PDIV=3D7 was the intended setting). This > > > > corresponds to 262749 PLL frequency/port clock. > > > > = > > > > Later the driver sets the same mode for which it calculates the same > > > > dco_int/dco_frac/div WRPLL parameters (with the correct PDIV=3D7 en= coding). > > > > = > > > > Based on the above, let's assume that PDIV=3D7 was intended and the= HW > > > > just ignores bit#0 in the PDIV register field for this setting, tre= ating > > > > 100b and 101b encodings the same way. > > > > = > > > > While at it add the MISSING_CASE() for the p0,p2 divider decodings. > > > > = > > > > v2: (Ville) > > > > - Add a define for the incorrect divider value. > > > > - Emit only a debug message when detecting the incorrect divider va= lue. > > > > - Use fallthrough from the incorrect divider value case. > > > > - Add the MISSING_CASE()s. > > > > = > > > > Cc: Ville Syrj=E4l=E4 > > > > Signed-off-by: Imre Deak > > > > --- > > > > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 14 ++++++++++++++ > > > > drivers/gpu/drm/i915/i915_reg.h | 1 + > > > > 2 files changed, 15 insertions(+) > > > > = > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/driver= s/gpu/drm/i915/display/intel_dpll_mgr.c > > > > index e08684e34078..61cb558c60d1 100644 > > > > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > > > > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c > > > > @@ -1602,12 +1602,26 @@ static int skl_ddi_wrpll_get_freq(struct dr= m_i915_private *i915, > > > > case DPLL_CFGCR2_PDIV_3: > > > > p0 =3D 3; > > > > break; > > > > + default: > > > > + if (p0 =3D=3D DPLL_CFGCR2_PDIV_7_INVALID) > > > = > > > Why not just 'case DPLL_CFGCR2_PDIV_7_INVALID:' ? > > = > > So we can use fallthrough for both this one and the default case. > = > IMO trying to be fancy just makes the code harder to read. > > > > > + /* > > > > + * Incorrect ASUS-Z170M BIOS setting, the HW seems to ignore bi= t#0, > > > > + * handling it the same way as PDIV_7. > > > > + */ > > > > + drm_dbg_kms(&i915->drm, "Invalid WRPLL PDIV divider value, fixi= ng it.\n"); > > > > + else > > > > + MISSING_CASE(p0); > > > > + > > > > + fallthrough; > > > > case DPLL_CFGCR2_PDIV_7: > > > > p0 =3D 7; > > > > break; > > > > } > > > > = > > > > switch (p2) { > > > > + default: > > > > + MISSING_CASE(p2); > > > > + fallthrough; > > > = > > > Is there a specific reason we fall through to the 5 and 7 cases for > > > bogus values? > > = > > Just to default to dividers that result in the minimum PLL freq. > = > I'd probably just set them to zero if they're bogus. Looks like > that should already give us warn and just return zero as the freq. Ok. > > > > case DPLL_CFGCR2_KDIV_5: > > > > p2 =3D 5; > > > > break; > > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915= /i915_reg.h > > > > index 88c215cf97d4..d911583526db 100644 > > > > --- a/drivers/gpu/drm/i915/i915_reg.h > > > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > > > @@ -10261,6 +10261,7 @@ enum skl_power_gate { > > > > #define DPLL_CFGCR2_PDIV_2 (1 << 2) > > > > #define DPLL_CFGCR2_PDIV_3 (2 << 2) > > > > #define DPLL_CFGCR2_PDIV_7 (4 << 2) > > > > +#define DPLL_CFGCR2_PDIV_7_INVALID (5 << 2) > > > > #define DPLL_CFGCR2_CENTRAL_FREQ_MASK (3) > > > > = > > > > #define DPLL_CFGCR1(id) _MMIO_PIPE((id) - SKL_DPLL1, _DPLL1_CFGCR1= , _DPLL2_CFGCR1) > > > > -- = > > > > 2.25.1 > > > = > > > -- = > > > Ville Syrj=E4l=E4 > > > Intel > = > -- = > Ville Syrj=E4l=E4 > Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx