diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:52:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:52:35 -0400 |
commit | 5335a40be6867eff986a31bcd8fc82a5cb1e16bb (patch) | |
tree | b32be59c2a2679a5cc3fef172006886f7dcd2466 /drivers/char/drm/via_drv.h | |
parent | 393bfca19ecdce60a8d9a4d2577cac11ca924a25 (diff) | |
parent | ef68d295508d52e792abf70d4f84461104d33b9d (diff) |
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
via: Make sure we flush write-combining using a follow-up read.
via: Try to improve command-buffer chaining.
drm: remove old taskqueue remnant
drm: rename badly named define and cleanup ioctl code spacing
radeon: Don't mess up page flipping when a file descriptor is closed.
drm/radeon: upgrade to 1.27 - make PCI GART more flexible
Diffstat (limited to 'drivers/char/drm/via_drv.h')
-rw-r--r-- | drivers/char/drm/via_drv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h index 8b8778d4a423..b46ca8e6306d 100644 --- a/drivers/char/drm/via_drv.h +++ b/drivers/char/drm/via_drv.h | |||
@@ -29,11 +29,11 @@ | |||
29 | 29 | ||
30 | #define DRIVER_NAME "via" | 30 | #define DRIVER_NAME "via" |
31 | #define DRIVER_DESC "VIA Unichrome / Pro" | 31 | #define DRIVER_DESC "VIA Unichrome / Pro" |
32 | #define DRIVER_DATE "20061227" | 32 | #define DRIVER_DATE "20070202" |
33 | 33 | ||
34 | #define DRIVER_MAJOR 2 | 34 | #define DRIVER_MAJOR 2 |
35 | #define DRIVER_MINOR 11 | 35 | #define DRIVER_MINOR 11 |
36 | #define DRIVER_PATCHLEVEL 0 | 36 | #define DRIVER_PATCHLEVEL 1 |
37 | 37 | ||
38 | #include "via_verifier.h" | 38 | #include "via_verifier.h" |
39 | 39 | ||
@@ -93,6 +93,7 @@ typedef struct drm_via_private { | |||
93 | unsigned long vram_offset; | 93 | unsigned long vram_offset; |
94 | unsigned long agp_offset; | 94 | unsigned long agp_offset; |
95 | drm_via_blitq_t blit_queues[VIA_NUM_BLIT_ENGINES]; | 95 | drm_via_blitq_t blit_queues[VIA_NUM_BLIT_ENGINES]; |
96 | uint32_t dma_diff; | ||
96 | } drm_via_private_t; | 97 | } drm_via_private_t; |
97 | 98 | ||
98 | enum via_family { | 99 | enum via_family { |