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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE288C433FE for ; Thu, 6 Oct 2022 21:08:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231624AbiJFVIp (ORCPT ); Thu, 6 Oct 2022 17:08:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232023AbiJFVIl (ORCPT ); Thu, 6 Oct 2022 17:08:41 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1ADB5C14A3; Thu, 6 Oct 2022 14:08:38 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Mk3vM33ZQz4xFv; Fri, 7 Oct 2022 08:08:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1665090513; bh=tBh7R6EFNvNHC472p+hpxdozssjAKs0uoyZ2/Iz5m7c=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=lEZ1s/HQiOR9m8FWwvlBEaEksytuS4VvE0NaNWxJyYQUqlyvAgZV9TvsHaf8jc+0F TMbVyFcXYBIBH1GRM2dfDclqp0olE3JhdqgiOlM02TBf3ifpLxwe0y7qgBco6xYr// TrnyLkwtS7pFp5fKipMYaYCoYsWSo+suiCDC9y9tvJ370eCjGwKA2+BxDQBi92NFoP xx9AyE7ttg86rcV5lvlsAyfUHOcWzEE8lyMK4ghfM5X0MtyVxfVn4yYOn/wFCH+qR0 BSBfEKgW9sOOF+2Z7+us9y+wJu/NzsOI7BQe581i8o1E1N38oqDfsKdSW8ypePg/ce 2LEnAms0O1R8w== Date: Fri, 7 Oct 2022 03:52:44 +1100 From: Stephen Rothwell To: Alex Deucher Cc: Stephen Rothwell , David Airlie , Hamza Mahfooz , Mark Brown , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Aurabindo Pillai , Alex Deucher Subject: Re: linux-next: build failure after merge of the drm tree Message-ID: <20221007035244.46e258a3@canb.auug.org.au> In-Reply-To: References: <20220930105434.111407-1-broonie@kernel.org> <20221004132047.435d42db@canb.auug.org.au> <20221004140558.64f59f2c@canb.auug.org.au> <09cd11c5-2a15-3653-957c-88c751fa9029@amd.com> <20221006092810.0c3a2238@canb.auug.org.au> <20221006191245.11bb0e2c@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/yq=CMsPbtfbw3ZbIbj0A.8v"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/yq=CMsPbtfbw3ZbIbj0A.8v Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Alex, On Thu, 6 Oct 2022 09:56:32 -0400 Alex Deucher wrot= e: > > This looks good to me. Care to add you s-o-b? >=20 > On Thu, Oct 6, 2022 at 4:12 AM Stephen Rothwell wr= ote: > > > > This works as well, and (in my opinion) is better: > > > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/= gpu/drm/amd/display/dc/core/dc_stream.c > > index ae13887756bf..fb6222d4c430 100644 > > --- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c > > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c > > @@ -499,7 +499,7 @@ bool dc_stream_remove_writeback(struct dc *dc, > > struct dc_stream_state *stream, > > uint32_t dwb_pipe_inst) > > { > > - int i =3D 0, j =3D 0; > > + unsigned int i, j; > > if (stream =3D=3D NULL) { > > dm_error("DC: dc_stream is NULL!\n"); > > return false; > > @@ -520,9 +520,9 @@ bool dc_stream_remove_writeback(struct dc *dc, > > } > > > > /* remove writeback info for disabled writeback pipes from stre= am */ > > - for (i =3D 0, j =3D 0; i < stream->num_wb_info && j < MAX_DWB_P= IPES; i++) { > > + for (i =3D 0, j =3D 0; i < stream->num_wb_info; i++) { > > if (stream->writeback_info[i].wb_enabled) { > > - if (i !=3D j) > > + if (j < i) > > /* trim the array */ > > stream->writeback_info[j] =3D stream->w= riteback_info[i]; > > j++; Signed-off-by: Stephen Rothwell --=20 Cheers, Stephen Rothwell --Sig_/yq=CMsPbtfbw3ZbIbj0A.8v Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmM/B9wACgkQAVBC80lX 0GxPBwf/X9e+0uhZmXWuqnUtNXKQwd59fHfR7z+ygsIZb+QvXVfou3rxBBG01k9L ynx2bUMXHzZclPr4YRBTujJg+WUrGRaSSwQLYMnaMldJPLIw1DVOzQPJc55MzkTx Ot1EwdItYS0CohnccfrUZwWTs7j8j5rkn9tQNDRmkPAS5HQ+SzIir2oA0axR78yT tL9uxN762UYNBTPGH07aZ2Z/tMMTglop9JtzsAhtJJzUMK9G4VMMP1UDld8PfYwf 1yz85G9JBKhEjk+NItYGvKLK3XzxERwusBaUUGgb77dsZ2A/njBwZkkHjPeP7Djr gvipz9skgMi5RjNrKa3caq0X0EYP6g== =mEP6 -----END PGP SIGNATURE----- --Sig_/yq=CMsPbtfbw3ZbIbj0A.8v--