diff options
| author | Stuart Bennett <stuart@freedesktop.org> | 2009-03-24 16:42:36 +0000 |
|---|---|---|
| committer | Stuart Bennett <stuart@freedesktop.org> | 2009-03-25 02:50:34 +0000 |
| commit | b71f3f114e6f0e94e15958c0aa12e804392f9df2 (patch) | |
| tree | df9109eea852512e7af9debd5e76edb8f3125fe6 /shared-core/nouveau_mem.c | |
| parent | d6ad0dba01a8246b9e7c96388f747c8ed9631ce4 (diff) | |
nouveau: use PFB_CSTATUS naming from ddx (reg introduced with nv10)
NV04 had a PFB_FIFO_DATA at the same address, which we don't use, so
remove it to reduce confusion
Diffstat (limited to 'shared-core/nouveau_mem.c')
| -rw-r--r-- | shared-core/nouveau_mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/nouveau_mem.c b/shared-core/nouveau_mem.c index 64125b61..6d928f45 100644 --- a/shared-core/nouveau_mem.c +++ b/shared-core/nouveau_mem.c @@ -300,9 +300,9 @@ uint64_t nouveau_mem_fb_amount(struct drm_device *dev) } else { uint64_t mem; - mem = (NV_READ(NV04_FIFO_DATA) & - NV10_FIFO_DATA_RAM_AMOUNT_MB_MASK) >> - NV10_FIFO_DATA_RAM_AMOUNT_MB_SHIFT; + mem = (NV_READ(NV10_PFB_CSTATUS) & + NV10_PFB_CSTATUS_RAM_AMOUNT_MB_MASK) >> + NV10_PFB_CSTATUS_RAM_AMOUNT_MB_SHIFT; return mem*1024*1024; } break; |