diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-04-01 21:09:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 16:31:49 +1000 |
| commit | 6d597027755b2eed4298b85ebe3cb5c93b29d1a9 (patch) | |
| tree | 827e189534f285c2bbf4c96e627685d27937b4db /drivers/gpu/drm/nouveau/nouveau_state.c | |
| parent | 78339fb75c21403677f61a02e1839b626a79325b (diff) | |
drm/nouveau: use the same packet header macros as userspace
Cosmetic cleanup only.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 78fb2cbeea2..e76edb51373 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -639,9 +639,9 @@ nouveau_card_channel_init(struct drm_device *dev) if (ret) goto error; - BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_NAME, 1); + BEGIN_NV04(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_NAME, 1); OUT_RING (chan, NvM2MF); - BEGIN_RING(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 3); + BEGIN_NV04(chan, NvSubM2MF, NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 3); OUT_RING (chan, NvNotify0); OUT_RING (chan, chan->vram_handle); OUT_RING (chan, chan->gart_handle); @@ -655,7 +655,7 @@ nouveau_card_channel_init(struct drm_device *dev) if (ret) goto error; - BEGIN_NVC0(chan, 2, NvSubM2MF, 0x0000, 1); + BEGIN_NVC0(chan, NvSubM2MF, 0x0000, 1); OUT_RING (chan, 0x00009039); } else if (dev_priv->card_type <= NV_E0) { @@ -669,7 +669,7 @@ nouveau_card_channel_init(struct drm_device *dev) if (ret) goto error; - BEGIN_NVC0(chan, 2, NvSubCopy, 0x0000, 1); + BEGIN_NVC0(chan, NvSubCopy, 0x0000, 1); OUT_RING (chan, 0x0000a0b5); } |