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 E7492C433E0 for ; Fri, 12 Feb 2021 18:36: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 910E564DEA for ; Fri, 12 Feb 2021 18:36:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 910E564DEA 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=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3947A6EEB0; Fri, 12 Feb 2021 18:36:02 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01BD86EEB0 for ; Fri, 12 Feb 2021 18:36:00 +0000 (UTC) IronPort-SDR: vVEwRj6PfUaEETY7jV+ybJIErYZil1Q73CfEZikguhSJMBfMJxxp2qi8LpcHNrYl4PRt/RGect 5w1sHLBx3fiw== X-IronPort-AV: E=McAfee;i="6000,8403,9893"; a="182527699" X-IronPort-AV: E=Sophos;i="5.81,174,1610438400"; d="scan'208";a="182527699" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Feb 2021 10:35:59 -0800 IronPort-SDR: wZ/8CvZPOSlQSA/PIOSI3SWfyfZM+xLGaKVhDTO67ONxZDCmpR9y0+dBEtTUSja5LOwLuyLR5E BDMSSF1oYwzw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,174,1610438400"; d="scan'208";a="398094631" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by orsmga008.jf.intel.com with SMTP; 12 Feb 2021 10:35:56 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 12 Feb 2021 20:35:55 +0200 Date: Fri, 12 Feb 2021 20:35:55 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: =?iso-8859-1?Q?Jos=E9?= Roberto de Souza Message-ID: References: <20210212182201.155043-1-jose.souza@intel.com> <20210212182201.155043-3-jose.souza@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210212182201.155043-3-jose.souza@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH 3/3] drm/i915: Fix plane watermark mismatches 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 Fri, Feb 12, 2021 at 10:22:01AM -0800, Jos=E9 Roberto de Souza wrote: > Found a system were firmware/BIOS left the plane_res_b and plane_res_l > set with non-zero values for disable planes. It pretty much happens always since the reset value is not zero. IIRC we made the state chcker pedantic enough to complain about that, so we need to clean it up. > As the planes are disabled i915 will not even try to sanitize it so > here returning earlier if both skl_wm_levels being compared are > disabled, if that is true no need to check the other fields as HW > will ignore it. > = > Signed-off-by: Jos=E9 Roberto de Souza > --- > drivers/gpu/drm/i915/intel_pm.c | 2 ++ > 1 file changed, 2 insertions(+) > = > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel= _pm.c > index 8cc67f9c4e58..c630dc10c34b 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -5633,6 +5633,8 @@ void skl_write_cursor_wm(struct intel_plane *plane, > bool skl_wm_level_equals(const struct skl_wm_level *l1, > const struct skl_wm_level *l2) > { > + if (l1->plane_en =3D=3D false && l2->plane_en =3D=3D false) > + return true; > return l1->plane_en =3D=3D l2->plane_en && > l1->ignore_lines =3D=3D l2->ignore_lines && > l1->plane_res_l =3D=3D l2->plane_res_l && > -- = > 2.30.1 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx