aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_dma.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dma.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_dma.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h
index d578c21d3c8d..c36f1763feaa 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.h
@@ -77,7 +77,8 @@ enum {
77 /* G80+ display objects */ 77 /* G80+ display objects */
78 NvEvoVRAM = 0x01000000, 78 NvEvoVRAM = 0x01000000,
79 NvEvoFB16 = 0x01000001, 79 NvEvoFB16 = 0x01000001,
80 NvEvoFB32 = 0x01000002 80 NvEvoFB32 = 0x01000002,
81 NvEvoVRAM_LP = 0x01000003
81}; 82};
82 83
83#define NV_MEMORY_TO_MEMORY_FORMAT 0x00000039 84#define NV_MEMORY_TO_MEMORY_FORMAT 0x00000039
@@ -125,6 +126,12 @@ extern void
125OUT_RINGp(struct nouveau_channel *chan, const void *data, unsigned nr_dwords); 126OUT_RINGp(struct nouveau_channel *chan, const void *data, unsigned nr_dwords);
126 127
127static inline void 128static inline void
129BEGIN_NVC0(struct nouveau_channel *chan, int op, int subc, int mthd, int size)
130{
131 OUT_RING(chan, (op << 28) | (size << 16) | (subc << 13) | (mthd >> 2));
132}
133
134static inline void
128BEGIN_RING(struct nouveau_channel *chan, int subc, int mthd, int size) 135BEGIN_RING(struct nouveau_channel *chan, int subc, int mthd, int size)
129{ 136{
130 OUT_RING(chan, (subc << 13) | (size << 18) | mthd); 137 OUT_RING(chan, (subc << 13) | (size << 18) | mthd);