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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,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 A6A52C7CFFD for ; Fri, 13 Dec 2019 20:39:57 +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 EAD3824801 for ; Fri, 13 Dec 2019 20:39:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EAD3824801 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 27F906EB46; Fri, 13 Dec 2019 17:03:26 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE2766EB46 for ; Fri, 13 Dec 2019 17:03:24 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Dec 2019 09:03:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,309,1571727600"; d="scan'208";a="204375544" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga007.jf.intel.com with SMTP; 13 Dec 2019 09:03:20 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 13 Dec 2019 19:03:20 +0200 Date: Fri, 13 Dec 2019 19:03:20 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Vandita Kulkarni Message-ID: <20191213170320.GA1208@intel.com> References: <20191213154515.12121-1-vandita.kulkarni@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191213154515.12121-1-vandita.kulkarni@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix WARN_ON condition for cursor plane ddb allocation 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: jani.nikula@intel.com, 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, Dec 13, 2019 at 09:15:15PM +0530, Vandita Kulkarni wrote: > In some cases min_ddb_alloc can be U16_MAX, exclude it > from the WARN_ON. The two cases I think are: latency[level]=3D=3D0 or wm[level].res_lines>31 You said you hit the latter case. May want to mention those in the commit message. > = > Fixes: 10a7e07b68b9 ("drm/i915: Make sure cursor has enough ddb for the s= elected wm level") > Suggested-by: Ville Syrj=E4l=E4 > Signed-off-by: Vandita Kulkarni > --- > drivers/gpu/drm/i915/intel_pm.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel= _pm.c > index ccbbdf4a6aab..cec4fa79422c 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4312,8 +4312,10 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *crt= c_state, > &crtc_state->wm.skl.optimal.planes[plane_id]; > = > if (plane_id =3D=3D PLANE_CURSOR) { > - if (WARN_ON(wm->wm[level].min_ddb_alloc > > - total[PLANE_CURSOR])) { > + if (wm->wm[level].min_ddb_alloc > > + total[PLANE_CURSOR]) { > + WARN_ON(wm->wm[level].min_ddb_alloc !=3D > + U16_MAX); > blocks =3D U32_MAX; The line wraps make this look rather ugly. Might be better to just ignore the 80col limit here. Reviewed-by: Ville Syrj=E4l=E4 > break; > } > -- = > 2.21.0.5.gaeb582a -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx