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,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 88E9CC4338F for ; Tue, 10 Aug 2021 13:20:02 +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 3B37760F38 for ; Tue, 10 Aug 2021 13:20:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3B37760F38 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 BE40589F5B; Tue, 10 Aug 2021 13:20:01 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 475D389F5B for ; Tue, 10 Aug 2021 13:20:01 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10070"; a="214628146" X-IronPort-AV: E=Sophos;i="5.84,310,1620716400"; d="scan'208";a="214628146" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2021 06:20:00 -0700 X-IronPort-AV: E=Sophos;i="5.84,310,1620716400"; d="scan'208";a="515841095" Received: from aktiwary-mobl3.amr.corp.intel.com (HELO localhost) ([10.249.40.8]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2021 06:19:58 -0700 From: Jani Nikula To: Manasi Navare , intel-gfx@lists.freedesktop.org In-Reply-To: <20210714223414.9849-1-manasi.d.navare@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210714223414.9849-1-manasi.d.navare@intel.com> Date: Tue, 10 Aug 2021 16:19:54 +0300 Message-ID: <87czqlo2rp.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: Fix shared dpll mismatch for bigjoiner slave 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 14 Jul 2021, Manasi Navare wrote: > Currently when we do the HW state readout, we dont set the shared dpll to= NULL > for the bigjoiner slave which should not have a DPLL assigned. So it has > some garbage while the HW state readout is NULL. So explicitly reset > the shared dpll for bigjoiner slave pipe. > > Bug: https://gitlab.freedesktop.org/drm/intel/-/issues/3465 > Cc: Ville Syrj=C3=A4l=C3=A4 > Cc: Ankit Nautiyal > Tested-By: Swati Sharma > Signed-off-by: Manasi Navare > --- > drivers/gpu/drm/i915/display/intel_display.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index 65ddb6ca16e6..c274bfb8e549 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -9006,6 +9006,10 @@ verify_crtc_state(struct intel_crtc *crtc, > if (!new_crtc_state->hw.active) > return; >=20=20 > + if (new_crtc_state->bigjoiner_slave) > + /* No PLLs set for slave */ > + pipe_config->shared_dpll =3D NULL; > + I know it's been merged already, but feels wrong to have this in verify_crtc_state(). Kind of out of place. BR, Jani. > intel_pipe_config_sanity_check(dev_priv, pipe_config); >=20=20 > if (!intel_pipe_config_compare(new_crtc_state, --=20 Jani Nikula, Intel Open Source Graphics Center