diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-11-23 19:26:24 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-12-21 02:17:34 -0500 |
commit | 96545299d7405d4c0f44b727718e263653fc11aa (patch) | |
tree | d5c9ffd220778e11e026dab5cabbf74ae8a7cf2d /drivers/gpu/drm/nouveau/nouveau_dma.h | |
parent | 5216782bf8c195de3befe0742a877c987dd3c4fd (diff) |
drm/nvc0: fix channel dma init paths
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dma.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dma.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h index d578c21d3c8d..c118a331b5bc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.h +++ b/drivers/gpu/drm/nouveau/nouveau_dma.h | |||
@@ -125,6 +125,12 @@ extern void | |||
125 | OUT_RINGp(struct nouveau_channel *chan, const void *data, unsigned nr_dwords); | 125 | OUT_RINGp(struct nouveau_channel *chan, const void *data, unsigned nr_dwords); |
126 | 126 | ||
127 | static inline void | 127 | static inline void |
128 | BEGIN_NVC0(struct nouveau_channel *chan, int op, int subc, int mthd, int size) | ||
129 | { | ||
130 | OUT_RING(chan, (op << 28) | (size << 16) | (subc << 13) | (mthd >> 2)); | ||
131 | } | ||
132 | |||
133 | static inline void | ||
128 | BEGIN_RING(struct nouveau_channel *chan, int subc, int mthd, int size) | 134 | BEGIN_RING(struct nouveau_channel *chan, int subc, int mthd, int size) |
129 | { | 135 | { |
130 | OUT_RING(chan, (subc << 13) | (size << 18) | mthd); | 136 | OUT_RING(chan, (subc << 13) | (size << 18) | mthd); |