Skip to content

Commit

Permalink
drm/nv40/pm: parse geometric delta clock from vbios
Browse files Browse the repository at this point in the history
This changes the meaning of what we reported as "core" clock previously.

The shader/rop units are allegedly supposed to be run at the base clock
listed in the perf table, while the geometric clock can be bumped from
this value on some boards.

So that we can report both, we'll report the base clock as "shader" (since
the shaders *do* run at it), and the geometric clock as "core".

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Sep 20, 2011
1 parent 52e0d0e commit 9f40360
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/gpu/drm/nouveau/nouveau_perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9f40360

Please sign in to comment.