diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-11-22 07:05:54 +0100 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-12-08 03:00:34 +0100 |
| commit | d908175cca901b95ba1628428b216e6e7188e8fb (patch) | |
| tree | 720e95c36101ca4fa2d46792c58bd2456c2df8db /drivers/gpu/drm/nouveau/nv04_fifo.c | |
| parent | drm/nouveau: Spin for a bit in nouveau_fence_wait() before yielding the CPU. (diff) | |
| download | linux-d908175cca901b95ba1628428b216e6e7188e8fb.tar.xz linux-d908175cca901b95ba1628428b216e6e7188e8fb.zip | |
drm/nouveau: make fifo.create_context() responsible for mapping control regs
The regs belong to PFIFO, they're different for pretty much the same
generations we need different PFIFO control for, and NVC0 is going
to be even more different than the rest.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_fifo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_fifo.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c index a32ba8ccaae6..f89d104698df 100644 --- a/drivers/gpu/drm/nouveau/nv04_fifo.c +++ b/drivers/gpu/drm/nouveau/nv04_fifo.c @@ -129,6 +129,11 @@ nv04_fifo_create_context(struct nouveau_channel *chan) if (ret) return ret; + chan->user = ioremap(pci_resource_start(dev->pdev, 0) + + NV03_USER(chan->id), PAGE_SIZE); + if (!chan->user) + return -ENOMEM; + spin_lock_irqsave(&dev_priv->context_switch_lock, flags); /* Setup initial state */ @@ -173,6 +178,10 @@ nv04_fifo_destroy_context(struct nouveau_channel *chan) spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags); /* Free the channel resources */ + if (chan->user) { + iounmap(chan->user); + chan->user = NULL; + } nouveau_gpuobj_ref(NULL, &chan->ramfc); } |