diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2011-04-19 23:21:40 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2011-05-15 20:50:47 -0400 |
commit | 047d2df54cb866f13014cb566eac61449bf89a29 (patch) | |
tree | 001ae0434144f215683997afd5a2426ec4141d09 | |
parent | 40f6193b8fe3c29f49c675f22c643e9ea9e8950f (diff) |
drm/nvc0/pm: parse clock for pll 0x0a (0x137020) from perf table
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_perf.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 224d3a1ce6ec..444a943283b1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -433,6 +433,7 @@ struct nouveau_pm_level { | |||
433 | u32 memory; | 433 | u32 memory; |
434 | u32 shader; | 434 | u32 shader; |
435 | u32 unk05; | 435 | u32 unk05; |
436 | u32 unk0a; | ||
436 | 437 | ||
437 | u8 voltage; | 438 | u8 voltage; |
438 | u8 fanspeed; | 439 | u8 fanspeed; |
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 90ab4978e812..6e3f93334a97 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c | |||
@@ -243,12 +243,14 @@ nouveau_perf_init(struct drm_device *dev) | |||
243 | } else { | 243 | } else { |
244 | perflvl->shader = ROM16(subent(3)) & 0xfff; | 244 | perflvl->shader = ROM16(subent(3)) & 0xfff; |
245 | perflvl->core = perflvl->shader / 2; | 245 | perflvl->core = perflvl->shader / 2; |
246 | perflvl->unk0a = ROM16(subent(4)) & 0xfff; | ||
246 | perflvl->memory = ROM16(subent(5)) & 0xfff; | 247 | perflvl->memory = ROM16(subent(5)) & 0xfff; |
247 | } | 248 | } |
248 | 249 | ||
249 | perflvl->core *= 1000; | 250 | perflvl->core *= 1000; |
250 | perflvl->shader *= 1000; | 251 | perflvl->shader *= 1000; |
251 | perflvl->memory *= 1000; | 252 | perflvl->memory *= 1000; |
253 | perflvl->unk0a *= 1000; | ||
252 | break; | 254 | break; |
253 | } | 255 | } |
254 | 256 | ||