diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-05-01 16:33:37 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 16:56:05 +1000 |
| commit | 03bd6efa1468830d1dc9380654229d427aa487d7 (patch) | |
| tree | 3a264d0a0e7503d4a50a1d388396c0e726e244bd /drivers/gpu/drm/nouveau/nouveau_channel.c | |
| parent | 71af5e62db5d7d6348e838d0f79533653e2f8cfe (diff) | |
drm/nv50/fifo: use hardware channel kickoff functionality
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_channel.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_channel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c index 9f4a5c5d590..a1f566758e7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_channel.c +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c @@ -190,7 +190,7 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, chan->user_get_hi = 0x60; /* disable the fifo caches */ - if (dev_priv->card_type < NV_C0) + if (dev_priv->card_type < NV_50) nv_wr32(dev, NV03_PFIFO_CACHES, 0); /* Construct initial RAMFC for new channel */ @@ -200,7 +200,7 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, return ret; } - if (dev_priv->card_type < NV_C0) + if (dev_priv->card_type < NV_50) nv_wr32(dev, NV03_PFIFO_CACHES, 1); /* Insert NOPs for NOUVEAU_DMA_SKIPS */ @@ -306,7 +306,7 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) nouveau_channel_idle(chan); /* boot it off the hardware */ - if (dev_priv->card_type < NV_C0) + if (dev_priv->card_type < NV_50) nv_wr32(dev, NV03_PFIFO_CACHES, 0); /* destroy the engine specific contexts */ @@ -318,7 +318,7 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) pfifo->destroy_context(chan); } - if (dev_priv->card_type < NV_C0) + if (dev_priv->card_type < NV_50) nv_wr32(dev, NV03_PFIFO_CACHES, 1); /* aside from its resources, the channel should now be dead, |