diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 04:15:13 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-11-14 04:15:13 +1100 |
| commit | 53ab6026cfb20bfdf34b245e41af424be62941a8 (patch) | |
| tree | 976bae7ac57593ed861b5b7bc60a3bb72d2feed4 /shared-core | |
| parent | 7246a33dd104903bc9227628270712ea9e6168d8 (diff) | |
nouveau: Use "new" NV40 USER control regs.
Probably entirely pointless, but a simple change in any case.
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/nouveau_fifo.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c index 45b82113..7e109ada 100644 --- a/shared-core/nouveau_fifo.c +++ b/shared-core/nouveau_fifo.c @@ -295,12 +295,19 @@ nouveau_fifo_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, DRM_INFO("Allocating FIFO number %d\n", channel); /* Locate channel's user control regs */ - if (dev_priv->card_type < NV_50) { + if (dev_priv->card_type < NV_40) { chan->user = NV03_USER(channel); chan->user_size = NV03_USER_SIZE; chan->put = NV03_USER_DMA_PUT(channel); chan->get = NV03_USER_DMA_GET(channel); chan->ref_cnt = NV03_USER_REF_CNT(channel); + } else + if (dev_priv->card_type < NV_50) { + chan->user = NV40_USER(channel); + chan->user_size = NV40_USER_SIZE; + chan->put = NV40_USER_DMA_PUT(channel); + chan->get = NV40_USER_DMA_GET(channel); + chan->ref_cnt = NV40_USER_REF_CNT(channel); } else { chan->user = NV50_USER(channel); chan->user_size = NV50_USER_SIZE; |