git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_perf.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_perf.c
b/drivers/gpu/drm/nouveau/nouveau_perf.c
index
ac62a1b
..
670e3cb
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_perf.c
@@
-134,7
+134,7
@@
nouveau_perf_init(struct drm_device *dev)
case 0x13:
case 0x15:
perflvl->fanspeed = entry[55];
- perflvl->voltage =
entry[56]
;
+ perflvl->voltage =
(recordlen > 56) ? entry[56] : 0
;
perflvl->core = ROM32(entry[1]) * 10;
perflvl->memory = ROM32(entry[5]) * 20;
break;