On Fri, 2011-03-18 at 00:46 +0000, Emil Velikov wrote: > Perf tables v 1.2 and 1.3 (seen on Geforce FX / 5) are not long enough to > store > the voltage label/id > > Signed-off-by: Emil Velikov <[email protected]> > --- > drivers/gpu/drm/nouveau/nouveau_perf.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c > b/drivers/gpu/drm/nouveau/nouveau_perf.c > index ac62a1b..b09780b 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_perf.c > +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c > @@ -134,7 +134,11 @@ nouveau_perf_init(struct drm_device *dev) > case 0x13: > case 0x15: > perflvl->fanspeed = entry[55]; > - perflvl->voltage = entry[56]; > +/* > + * Table v 1.2 and 1.3 does not have big enough recordlen to store the > + * voltage > + */ I'm not sure the comment is 100% necessary, but, it should be indented to the same level as the perflvl->* member settings.
> + perflvl->voltage = (recordlen > 56) ? entry[56] : 0; > perflvl->core = ROM32(entry[1]) * 10; > perflvl->memory = ROM32(entry[5]) * 20; > break; _______________________________________________ Nouveau mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/nouveau
