geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nouveau/nv50: Correct thinko for 8800 chips + cleanup a bit.

main
Ben Skeggs 2007-08-22 12:54:26 +10:00
parent c8ee6a6cab
commit ae883c97ad
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
shared-core/nv50_fifo.c
View File

@ -63,24 +63,17 @@ nv50_fifo_channel_enable(struct drm_device *dev, int channel, int nt)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_channel *chan = dev_priv->fifos[channel]; struct nouveau_channel *chan = dev_priv->fifos[channel];
uint32_t inst;
DRM_DEBUG("ch%d\n", channel); DRM_DEBUG("ch%d\n", channel);
if (IS_G80) { if (!chan->ramfc)
if (!chan->ramin) return -EINVAL;
return -EINVAL;
NV_WRITE(NV50_PFIFO_CTX_TABLE(channel), if (IS_G80) inst = chan->ramfc->instance >> 12;
(chan->ramin->instance >> 12) | else inst = chan->ramfc->instance >> 8;
NV50_PFIFO_CTX_TABLE_CHANNEL_ENABLED); NV_WRITE(NV50_PFIFO_CTX_TABLE(channel),
} else { inst | NV50_PFIFO_CTX_TABLE_CHANNEL_ENABLED);
if (!chan->ramfc)
return -EINVAL;
NV_WRITE(NV50_PFIFO_CTX_TABLE(channel),
(chan->ramfc->instance >> 8) |
NV50_PFIFO_CTX_TABLE_CHANNEL_ENABLED);
}
if (!nt) nv50_fifo_init_thingo(dev); if (!nt) nv50_fifo_init_thingo(dev);
return 0; return 0;
@ -90,16 +83,13 @@ static void
nv50_fifo_channel_disable(struct drm_device *dev, int channel, int nt) nv50_fifo_channel_disable(struct drm_device *dev, int channel, int nt)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
uint32_t inst;
DRM_DEBUG("ch%d, nt=%d\n", channel, nt); DRM_DEBUG("ch%d, nt=%d\n", channel, nt);
if (IS_G80) { if (IS_G80) inst = NV50_PFIFO_CTX_TABLE_INSTANCE_MASK_G80;
NV_WRITE(NV50_PFIFO_CTX_TABLE(channel), else inst = NV50_PFIFO_CTX_TABLE_INSTANCE_MASK_G84;
NV50_PFIFO_CTX_TABLE_INSTANCE_MASK_G80); NV_WRITE(NV50_PFIFO_CTX_TABLE(channel), inst);
} else {
NV_WRITE(NV50_PFIFO_CTX_TABLE(channel),
NV50_PFIFO_CTX_TABLE_INSTANCE_MASK_G84);
}
if (!nt) nv50_fifo_init_thingo(dev); if (!nt) nv50_fifo_init_thingo(dev);
} }
@ -234,7 +224,9 @@ nv50_fifo_create_context(struct nouveau_channel *chan)
if (IS_G80) { if (IS_G80) {
uint32_t ramfc_offset = chan->ramin->gpuobj->im_pramin->start; uint32_t ramfc_offset = chan->ramin->gpuobj->im_pramin->start;
if ((ret = nouveau_gpuobj_new_fake(dev, ramfc_offset, ~0, 0x100, uint32_t vram_offset = chan->ramin->gpuobj->im_backing->start;
if ((ret = nouveau_gpuobj_new_fake(dev, ramfc_offset,
vram_offset, 0x100,
NVOBJ_FLAG_ZERO_ALLOC | NVOBJ_FLAG_ZERO_ALLOC |
NVOBJ_FLAG_ZERO_FREE, NVOBJ_FLAG_ZERO_FREE,
&ramfc, &chan->ramfc))) &ramfc, &chan->ramfc)))