1
0
Fork 0
alistair23-linux/drivers/gpu/drm/nouveau/core
Sergei Antonov 9a11843987 drm/nouveau/bios: fix a bit shift error introduced by 457e77b
Commit 457e77b264 added two checks applied to a
value received from nv_rd32(bios, 0x619f04). But after this new piece of code
is executed, the addr local variable does not hold the same value it used to
hold before the commit. Here is what is was assigned in the original code:
	(u64)(nv_rd32(bios, 0x619f04) & 0xffffff00) << 8
in the committed code it ends up with this value:
	(u64)(nv_rd32(bios, 0x619f04) >> 8) << 8
These expressions are obviously not equivalent.

My Nvidia video card does not show anything on the display when I boot a
kernel containing this commit.

The patch fixes the code so that the new checks are still done, but the
side effect of an incorrect addr value is gone.

Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sergei Antonov <saproj@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2014-04-18 13:15:18 +10:00
..
core drm/nouveau/core: extend width of engine mask for namedb 2014-03-26 13:59:33 +10:00
engine drm/nouveau/disp/dp: allow 540MHz data rate 2014-03-26 14:08:22 +10:00
include drm/nouveau/therm: let the vbios decide on the automatic fan management mode 2014-03-26 14:08:25 +10:00
subdev drm/nouveau/bios: fix a bit shift error introduced by 457e77b 2014-04-18 13:15:18 +10:00
os.h support for platform devices 2014-03-26 14:08:04 +10:00