From 2d74d2568c96699dce908030ba9f8bd2b55e9169 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 18 Jul 2011 16:02:37 +1000 Subject: [PATCH] --- yaml --- r: 269677 b: refs/heads/master c: 9f403603f29f748b50b85a1be1c2ca2c792ae200 h: refs/heads/master i: 269675: fc59333d8eee447ff2d45b9b0a8975e9fa6bd629 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_perf.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 792f2f949764..f13404ca1e6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52e0d0ecc8f82d4da12c31f0701bf490db5abe72 +refs/heads/master: 9f403603f29f748b50b85a1be1c2ca2c792ae200 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c b/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c index 854ca8573168..9f178aa94162 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -275,8 +275,9 @@ nouveau_perf_init(struct drm_device *dev) case 0x24: perflvl->fanspeed = entry[4]; perflvl->volt_min = entry[5]; - perflvl->core = ROM16(entry[6]) * 1000; - + perflvl->shader = ROM16(entry[6]) * 1000; + perflvl->core = perflvl->shader; + perflvl->core += (signed char)entry[8] * 1000; if (dev_priv->chipset == 0x49 || dev_priv->chipset == 0x4b) perflvl->memory = ROM16(entry[11]) * 1000;