From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934697AbcCPEyJ (ORCPT ); Wed, 16 Mar 2016 00:54:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44596 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750962AbcCPEyH (ORCPT ); Wed, 16 Mar 2016 00:54:07 -0400 Subject: Re: [PATCH] nouveau: fix nv40_perfctr_next() cleanup regression To: Arnd Bergmann , David Airlie References: <1457965458-3319933-1-git-send-email-arnd@arndb.de> Cc: Samuel Pitoiset , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org From: Ben Skeggs Message-ID: <56E8E73C.5080400@redhat.com> Date: Wed, 16 Mar 2016 14:55:24 +1000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1457965458-3319933-1-git-send-email-arnd@arndb.de> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="fol9o1WTeqNSIPFtLudPocloxMbk54Aab" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --fol9o1WTeqNSIPFtLudPocloxMbk54Aab Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 03/15/2016 12:24 AM, Arnd Bergmann wrote: > gcc-6 warns about code in the nouveau driver that is obviously silly: >=20 > drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c: In function 'nv40_perfct= r_next': > drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c:62:19: warning: self-comp= arison always evaluats to false [-Wtautological-compare] > if (pm->sequence !=3D pm->sequence) { >=20 > The behavior was accidentally introduced in a patch described as "This = is > purely preparation for upcoming commits, there should be no code change= s here.". > As far as I can tell, that was true for the rest of that patch except f= or > this one function, which has been changed to a NOP. >=20 > This patch restores the original behavior. >=20 > Signed-off-by: Arnd Bergmann > Fixes: 8c1aeaa13954 ("drm/nouveau/pm: cosmetic changes") Reviewed-by: Ben Skeggs > --- > drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c b/drivers/gp= u/drm/nouveau/nvkm/engine/pm/nv40.c > index 4bef72a9d106..3fda594700e0 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c > @@ -59,9 +59,11 @@ static void > nv40_perfctr_next(struct nvkm_pm *pm, struct nvkm_perfdom *dom) > { > struct nvkm_device *device =3D pm->engine.subdev.device; > - if (pm->sequence !=3D pm->sequence) { > + struct nv40_pm *nv40pm =3D container_of(pm, struct nv40_pm, base); > + > + if (nv40pm->sequence !=3D pm->sequence) { > nvkm_wr32(device, 0x400084, 0x00000020); > - pm->sequence =3D pm->sequence; > + nv40pm->sequence =3D pm->sequence; > } > } > =20 >=20 --fol9o1WTeqNSIPFtLudPocloxMbk54Aab Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJW6OdEAAoJEHYLnGJQkpH7ma8P/0jYsw4Jcmxqv6bfJ4LcfrXM sqoQDVUKGALKHvYZZw6ryCfd74UD5Kjod3E3JqxKR42g+gZwr3waEaLZHIXJFd34 Xm+8ZPevByWXdNTtONUiKVFSQqvkVAa0unhHKZHTJH9vQSqPivLC9yMZSLKBIHGh 2kQ/W+UljkGIgo0Asdy5dcl0JtRd8epQCMeI3yqDIB2KaAksNUH1VuLbe0NPJjmU hQcZ2UjMgnH9zK5EBC85Q5udFC1vhOzhtkmMT4US0YmjLqzHcc56L0tB+gVpRyyG jo3iJYaRar1LcZgnU9sJbH9jzIg2ivwnJ2/4CCDFor2Y6XJswH70M3kci2764FUb hJFLXqYPRt7hDcWjTx/8X1XwWZsHODClZ+h2nsuYGFdA/K2ECVUWIBB5zPFU2W0S mzb5ML+1m2mK9br8d2+/NPCg7PF7c8BslMV+WxeOr30yhNFt8cR/ANcymhWwM3oi e1jqvY+hQPajsPZp09OdnaNgVtWQgQ+o5F3bX33o3rVLgBEYFKb09Pr/bao08RSy Ew0/A2tUukJ6O6PFRK+hA1mZNjIfXk0KSU8yq3ZAsGLfU1ej8oipUnH8GhJd9FcK JCYeOHeLA9AAkYDZjWkw77wF4Mpux21ph7Dl8x2DZhOzi0EwzB9X3oW8M+Az7nBO rCyJl9XjaNHu4xQ5CODf =ODrX -----END PGP SIGNATURE----- --fol9o1WTeqNSIPFtLudPocloxMbk54Aab--