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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 96164C636CD for ; Fri, 10 Feb 2023 10:37:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 025F810E107; Fri, 10 Feb 2023 10:37:29 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7AB2110E107 for ; Fri, 10 Feb 2023 10:37:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676025447; x=1707561447; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=P0Fu8R1VW46sLsWNx0lyLmMFQD1qRFbGv4XmSZ7tXTk=; b=eCUPV8DZjAl1ctsGrNw5MU3McRyRY5w0lrU7mwqqSEihskwAmF9O5DIt +DJysKy/d6WeiCejbf2dAlRgvO9Eq9Y6R87WCGEpwoY/uQFHfsGpO/02q dMEnwB4NnhWOvnf81PcoHS4/l2bML0k3eUb5xg1eUVq1jOfa3MFwJLU9b qONqJrmSPYN9AXWBBWJ8iCeXBCFcIq/ImGxSXD73CzWzEEbLsDlIjd4Nr Fd1rTZnLsulh5kMo70fVVl9Xnp/A86Un91/EGMAq9TrB1Ba5cAGPt7h95 vGJYWXyCJoOlJIsEbQ5Sh8V91/wNjpGhcZxdSMYzfmpjG+g7e1U/05kW/ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10616"; a="357787652" X-IronPort-AV: E=Sophos;i="5.97,286,1669104000"; d="scan'208";a="357787652" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 02:37:26 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10616"; a="645590804" X-IronPort-AV: E=Sophos;i="5.97,286,1669104000"; d="scan'208";a="645590804" Received: from myegin-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.38.74]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Feb 2023 02:37:24 -0800 From: Jani Nikula To: Ville =?utf-8?B?U3lyasOkbMOk?= In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20230209003251.32021-1-ville.syrjala@linux.intel.com> <20230209003251.32021-2-ville.syrjala@linux.intel.com> <87y1p6x2xt.fsf@intel.com> Date: Fri, 10 Feb 2023 12:37:21 +0200 Message-ID: <87cz6hx0v2.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: Replace wm.max_levels with wm.num_levels and use it everywhere 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 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 10 Feb 2023, Ville Syrj=C3=A4l=C3=A4 wrote: > On Thu, Feb 09, 2023 at 05:40:14PM +0200, Jani Nikula wrote: >> On Thu, 09 Feb 2023, Ville Syrjala wrote: >> > @@ -3229,7 +3216,7 @@ static void ilk_wm_merge(struct drm_i915_private= *dev_priv, >> > merged->fbc_wm_enabled =3D DISPLAY_VER(dev_priv) >=3D 6; >> >=20=20 >> > /* merge each WM1+ level */ >> > - for (level =3D 1; level <=3D max_level; level++) { >> > + for (level =3D 1; level < num_levels - 1; level++) { >>=20 >> That's off by one, right? > > Whoops. Good eyes. Thanks for v2, I went ahead and pushed these to drm-intel-next so I can rebase my wm stuff on top. BR, Jani. --=20 Jani Nikula, Intel Open Source Graphics Center