nouveau: fix nv40_perfctr_next() cleanup regression
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 Mar 2016 14:24:10 +0000 (15:24 +0100)
committerDave Airlie <airlied@redhat.com>
Wed, 16 Mar 2016 05:08:43 +0000 (15:08 +1000)
gcc-6 warns about code in the nouveau driver that is obviously silly:

drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c: In function 'nv40_perfctr_next':
drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c:62:19: warning: self-comparison always evaluats to false [-Wtautological-compare]
  if (pm->sequence != pm->sequence) {

The behavior was accidentally introduced in a patch described as "This is
purely preparation for upcoming commits, there should be no code changes here.".
As far as I can tell, that was true for the rest of that patch except for
this one function, which has been changed to a NOP.

This patch restores the original behavior.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 8c1aeaa13954 ("drm/nouveau/pm: cosmetic changes")
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c

index 4bef72a9d106817fdf2e2091d971e60711c0d855..3fda594700e023f71d3cc5b885ef80232e4873d9 100644 (file)
@@ -59,9 +59,11 @@ static void
 nv40_perfctr_next(struct nvkm_pm *pm, struct nvkm_perfdom *dom)
 {
        struct nvkm_device *device = pm->engine.subdev.device;
-       if (pm->sequence != pm->sequence) {
+       struct nv40_pm *nv40pm = container_of(pm, struct nv40_pm, base);
+
+       if (nv40pm->sequence != pm->sequence) {
                nvkm_wr32(device, 0x400084, 0x00000020);
-               pm->sequence = pm->sequence;
+               nv40pm->sequence = pm->sequence;
        }
 }