diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_dma.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dma.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h index 690d5930ce32..984004d66a6d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.h +++ b/drivers/gpu/drm/nouveau/nouveau_dma.h | |||
| @@ -51,9 +51,11 @@ enum { | |||
| 51 | NvSubCtxSurf2D = 0, | 51 | NvSubCtxSurf2D = 0, |
| 52 | NvSubSw = 1, | 52 | NvSubSw = 1, |
| 53 | NvSubImageBlit = 2, | 53 | NvSubImageBlit = 2, |
| 54 | NvSub2D = 3, | ||
| 55 | NvSubGdiRect = 3, | 54 | NvSubGdiRect = 3, |
| 56 | NvSubCopy = 4, | 55 | |
| 56 | NvSub2D = 3, /* DO NOT CHANGE - hardcoded for kepler gr fifo */ | ||
| 57 | NvSubCopy = 4, /* DO NOT CHANGE - hardcoded for kepler gr fifo */ | ||
| 58 | FermiSw = 5, /* DO NOT CHANGE (well.. 6/7 will work...) */ | ||
| 57 | }; | 59 | }; |
| 58 | 60 | ||
| 59 | /* Object handles. */ | 61 | /* Object handles. */ |
| @@ -194,7 +196,6 @@ WIND_RING(struct nouveau_channel *chan) | |||
| 194 | #define NV84_SUBCHAN_UEVENT 0x00000020 | 196 | #define NV84_SUBCHAN_UEVENT 0x00000020 |
| 195 | #define NV84_SUBCHAN_WRCACHE_FLUSH 0x00000024 | 197 | #define NV84_SUBCHAN_WRCACHE_FLUSH 0x00000024 |
| 196 | #define NV10_SUBCHAN_REF_CNT 0x00000050 | 198 | #define NV10_SUBCHAN_REF_CNT 0x00000050 |
| 197 | #define NVSW_SUBCHAN_PAGE_FLIP 0x00000054 | ||
| 198 | #define NV11_SUBCHAN_DMA_SEMAPHORE 0x00000060 | 199 | #define NV11_SUBCHAN_DMA_SEMAPHORE 0x00000060 |
| 199 | #define NV11_SUBCHAN_SEMAPHORE_OFFSET 0x00000064 | 200 | #define NV11_SUBCHAN_SEMAPHORE_OFFSET 0x00000064 |
| 200 | #define NV11_SUBCHAN_SEMAPHORE_ACQUIRE 0x00000068 | 201 | #define NV11_SUBCHAN_SEMAPHORE_ACQUIRE 0x00000068 |
