diff options
Diffstat (limited to 'drivers/char/drm/radeon_drm.h')
-rw-r--r-- | drivers/char/drm/radeon_drm.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h index 5a8e23f916fc..71e5b21fad2c 100644 --- a/drivers/char/drm/radeon_drm.h +++ b/drivers/char/drm/radeon_drm.h | |||
@@ -223,10 +223,10 @@ typedef union { | |||
223 | #define R300_CMD_CP_DELAY 5 | 223 | #define R300_CMD_CP_DELAY 5 |
224 | #define R300_CMD_DMA_DISCARD 6 | 224 | #define R300_CMD_DMA_DISCARD 6 |
225 | #define R300_CMD_WAIT 7 | 225 | #define R300_CMD_WAIT 7 |
226 | # define R300_WAIT_2D 0x1 | 226 | # define R300_WAIT_2D 0x1 |
227 | # define R300_WAIT_3D 0x2 | 227 | # define R300_WAIT_3D 0x2 |
228 | # define R300_WAIT_2D_CLEAN 0x3 | 228 | # define R300_WAIT_2D_CLEAN 0x3 |
229 | # define R300_WAIT_3D_CLEAN 0x4 | 229 | # define R300_WAIT_3D_CLEAN 0x4 |
230 | #define R300_CMD_SCRATCH 8 | 230 | #define R300_CMD_SCRATCH 8 |
231 | 231 | ||
232 | typedef union { | 232 | typedef union { |
@@ -656,6 +656,7 @@ typedef struct drm_radeon_indirect { | |||
656 | #define RADEON_PARAM_SCRATCH_OFFSET 11 | 656 | #define RADEON_PARAM_SCRATCH_OFFSET 11 |
657 | #define RADEON_PARAM_CARD_TYPE 12 | 657 | #define RADEON_PARAM_CARD_TYPE 12 |
658 | #define RADEON_PARAM_VBLANK_CRTC 13 /* VBLANK CRTC */ | 658 | #define RADEON_PARAM_VBLANK_CRTC 13 /* VBLANK CRTC */ |
659 | #define RADEON_PARAM_FB_LOCATION 14 /* FB location */ | ||
659 | 660 | ||
660 | typedef struct drm_radeon_getparam { | 661 | typedef struct drm_radeon_getparam { |
661 | int param; | 662 | int param; |
@@ -722,7 +723,7 @@ typedef struct drm_radeon_surface_free { | |||
722 | unsigned int address; | 723 | unsigned int address; |
723 | } drm_radeon_surface_free_t; | 724 | } drm_radeon_surface_free_t; |
724 | 725 | ||
725 | #define DRM_RADEON_VBLANK_CRTC1 1 | 726 | #define DRM_RADEON_VBLANK_CRTC1 1 |
726 | #define DRM_RADEON_VBLANK_CRTC2 2 | 727 | #define DRM_RADEON_VBLANK_CRTC2 2 |
727 | 728 | ||
728 | #endif | 729 | #endif |