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=-16.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 87C4FC433E2 for ; Wed, 2 Sep 2020 12:36:59 +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 63AB420767 for ; Wed, 2 Sep 2020 12:36:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63AB420767 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 D77C16E4AB; Wed, 2 Sep 2020 12:36:58 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 335EB6E4AB for ; Wed, 2 Sep 2020 12:36:57 +0000 (UTC) IronPort-SDR: ywM5HMG3ALGJ1laP+ZhVPkgZ49ebAtKamUFqI4IA7wwkUaRG5/hQRzAnZehMlqsDUdSS2qBRMW MqW0gOAXj/rQ== X-IronPort-AV: E=McAfee;i="6000,8403,9731"; a="154879378" X-IronPort-AV: E=Sophos;i="5.76,383,1592895600"; d="scan'208";a="154879378" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2020 05:36:56 -0700 IronPort-SDR: R/r4cWZkO+LVwcZ9IIJce6YqYL+yxQi8YSEZfzOg5e8yhhsL6P8/PiI8qBWupAyLyN3eaKIcvY Jv2dczMBGomg== X-IronPort-AV: E=Sophos;i="5.76,383,1592895600"; d="scan'208";a="477622601" Received: from unknown (HELO intel.com) ([10.237.72.91]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Sep 2020 05:36:55 -0700 Date: Wed, 2 Sep 2020 15:37:06 +0300 From: "Lisovskiy, Stanislav" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: <20200902123706.GA26220@intel.com> References: <20200901151036.1312357-1-kai.vehmanen@linux.intel.com> <20200902103109.GM6112@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200902103109.GM6112@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH] drm/i915: fix regression leading to display audio probe failure on GLK 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-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Sep 02, 2020 at 01:31:09PM +0300, Ville Syrj=E4l=E4 wrote: > On Tue, Sep 01, 2020 at 06:10:36PM +0300, Kai Vehmanen wrote: > > In commit 4f0b4352bd26 ("drm/i915: Extract cdclk requirements checking > > to separate function") the order of force_min_cdclk_changed check and > > intel_modeset_checks(), was reversed. This broke the mechanism to > > immediately force a new CDCLK minimum, and lead to driver probe > > errors for display audio on GLK platform with 5.9-rc1 kernel. Fix > > the issue by moving intel_modeset_checks() call later. > = > Yep. I eyeed this same code recently and noticed the same bug. > The one thing I didn't yet figure out is whether there is some > subtle ordering requirement that was the reason for the change. > But considering intel_modeset_checks() doesn't really do much > anymore I think it should be safe. > = > Sadly CI has been lumping all underrun errors under some ancient > bugs, so no one noticed that things started to fail when this > regression was introduced :( > = > Reviewed-by: Ville Syrj=E4l=E4 Replying to that thread as well: Another concern I have here, as I understand now intel_modeset_checks will be put again after wm/ddb and bw calculations - won't this cause any additional issues? Also you now have modeset checks still before that force_min_cdclk condition check which is now in intel_modeset_calc_cdclk. My idea was to put all CDCLK related calculations and checks into same function. However this could be a bad idea, so should you may be just extract force_min_cdclk check condition back from intel_modeset_cal= c_cdclk to the original place where it was? I'm just now thinking in terms of not breaking anything else now... Stan > = > > = > > Fixes: 4f0b4352bd26 ("drm/i915: Extract cdclk requirements checking to = separate function)" > > BugLink: https://github.com/thesofproject/linux/issues/2410 > > Signed-off-by: Kai Vehmanen > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------ > > 1 file changed, 4 insertions(+), 6 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu= /drm/i915/display/intel_display.c > > index 7d50b7177d40..8caeed23037c 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -15009,12 +15009,6 @@ static int intel_atomic_check(struct drm_devic= e *dev, > > if (dev_priv->wm.distrust_bios_wm) > > any_ms =3D true; > > = > > - if (any_ms) { > > - ret =3D intel_modeset_checks(state); > > - if (ret) > > - goto fail; > > - } > > - > > intel_fbc_choose_crtc(dev_priv, state); > > ret =3D calc_watermark_data(state); > > if (ret) > > @@ -15029,6 +15023,10 @@ static int intel_atomic_check(struct drm_devic= e *dev, > > goto fail; > > = > > if (any_ms) { > > + ret =3D intel_modeset_checks(state); > > + if (ret) > > + goto fail; > > + > > ret =3D intel_modeset_calc_cdclk(state); > > if (ret) > > return ret; > > -- = > > 2.27.0 > = > -- = > Ville Syrj=E4l=E4 > Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx