]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit86d65b7e7a0c927d07d18605c276d0f142438ead
tree98ad2cfc3c38fce0d9f9fa57fdac0429fe683bc2
parent1a4be38a3a46898fee61b3ec1631d273dd66fcf2
nouveau: fix nv40_perfctr_next() cleanup regression

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