diff options
| author | Eric Anholt <eric@anholt.net> | 2007-09-19 15:55:58 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-09-19 15:55:58 -0700 |
| commit | 3d3a96ad4e5596187236898ca241515a21661b69 (patch) | |
| tree | 89b2b0900cf02235741fa670e7947babc8959ebe /shared-core/nouveau_fifo.c | |
| parent | 0055fd5c35306a6363b0414f7f2220b3d1c27ecc (diff) | |
| parent | e349b58b4a6ebfe299720cb921039a600c145e65 (diff) | |
Merge branch 'origin' into bo-set-pin
Diffstat (limited to 'shared-core/nouveau_fifo.c')
| -rw-r--r-- | shared-core/nouveau_fifo.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c index f0c2a556..437c84f2 100644 --- a/shared-core/nouveau_fifo.c +++ b/shared-core/nouveau_fifo.c @@ -34,8 +34,6 @@ int nouveau_fifo_number(struct drm_device *dev) struct drm_nouveau_private *dev_priv=dev->dev_private; switch(dev_priv->card_type) { - case NV_03: - return 8; case NV_04: case NV_05: return 16; @@ -84,9 +82,16 @@ static int nouveau_fifo_instmem_configure(struct drm_device *dev) { case NV_50: case NV_40: + switch (dev_priv->chipset) { + case 0x47: + case 0x49: + case 0x4b: + NV_WRITE(0x2230, 1); + break; + default: + break; + } NV_WRITE(NV40_PFIFO_RAMFC, 0x30002); - if((dev_priv->chipset == 0x49) || (dev_priv->chipset == 0x4b)) - NV_WRITE(0x2230,0x00000001); break; case NV_44: NV_WRITE(NV40_PFIFO_RAMFC, ((nouveau_mem_fb_amount(dev)-512*1024+dev_priv->ramfc_offset)>>16) | @@ -102,7 +107,6 @@ static int nouveau_fifo_instmem_configure(struct drm_device *dev) case NV_11: case NV_10: case NV_04: - case NV_03: NV_WRITE(NV03_PFIFO_RAMFC, dev_priv->ramfc_offset>>8); break; } |