diff options
Diffstat (limited to 'drivers/char/drm/radeon_drm.h')
-rw-r--r-- | drivers/char/drm/radeon_drm.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h index 66c4b6fed04f..5a8e23f916fc 100644 --- a/drivers/char/drm/radeon_drm.h +++ b/drivers/char/drm/radeon_drm.h | |||
@@ -417,7 +417,7 @@ typedef struct { | |||
417 | 417 | ||
418 | /* The current cliprects, or a subset thereof. | 418 | /* The current cliprects, or a subset thereof. |
419 | */ | 419 | */ |
420 | drm_clip_rect_t boxes[RADEON_NR_SAREA_CLIPRECTS]; | 420 | struct drm_clip_rect boxes[RADEON_NR_SAREA_CLIPRECTS]; |
421 | unsigned int nbox; | 421 | unsigned int nbox; |
422 | 422 | ||
423 | /* Counters for client-side throttling of rendering clients. | 423 | /* Counters for client-side throttling of rendering clients. |
@@ -426,7 +426,7 @@ typedef struct { | |||
426 | unsigned int last_dispatch; | 426 | unsigned int last_dispatch; |
427 | unsigned int last_clear; | 427 | unsigned int last_clear; |
428 | 428 | ||
429 | drm_tex_region_t tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS + | 429 | struct drm_tex_region tex_list[RADEON_NR_TEX_HEAPS][RADEON_NR_TEX_REGIONS + |
430 | 1]; | 430 | 1]; |
431 | unsigned int tex_age[RADEON_NR_TEX_HEAPS]; | 431 | unsigned int tex_age[RADEON_NR_TEX_HEAPS]; |
432 | int ctx_owner; | 432 | int ctx_owner; |
@@ -604,7 +604,7 @@ typedef struct drm_radeon_cmd_buffer { | |||
604 | int bufsz; | 604 | int bufsz; |
605 | char __user *buf; | 605 | char __user *buf; |
606 | int nbox; | 606 | int nbox; |
607 | drm_clip_rect_t __user *boxes; | 607 | struct drm_clip_rect __user *boxes; |
608 | } drm_radeon_cmd_buffer_t; | 608 | } drm_radeon_cmd_buffer_t; |
609 | 609 | ||
610 | typedef struct drm_radeon_tex_image { | 610 | typedef struct drm_radeon_tex_image { |
@@ -655,6 +655,7 @@ typedef struct drm_radeon_indirect { | |||
655 | #define RADEON_PARAM_GART_TEX_HANDLE 10 | 655 | #define RADEON_PARAM_GART_TEX_HANDLE 10 |
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 | 659 | ||
659 | typedef struct drm_radeon_getparam { | 660 | typedef struct drm_radeon_getparam { |
660 | int param; | 661 | int param; |
@@ -708,7 +709,7 @@ typedef struct drm_radeon_setparam { | |||
708 | #define RADEON_SETPARAM_PCIGART_LOCATION 3 /* PCI Gart Location */ | 709 | #define RADEON_SETPARAM_PCIGART_LOCATION 3 /* PCI Gart Location */ |
709 | #define RADEON_SETPARAM_NEW_MEMMAP 4 /* Use new memory map */ | 710 | #define RADEON_SETPARAM_NEW_MEMMAP 4 /* Use new memory map */ |
710 | #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5 /* PCI GART Table Size */ | 711 | #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5 /* PCI GART Table Size */ |
711 | 712 | #define RADEON_SETPARAM_VBLANK_CRTC 6 /* VBLANK CRTC */ | |
712 | /* 1.14: Clients can allocate/free a surface | 713 | /* 1.14: Clients can allocate/free a surface |
713 | */ | 714 | */ |
714 | typedef struct drm_radeon_surface_alloc { | 715 | typedef struct drm_radeon_surface_alloc { |
@@ -721,4 +722,7 @@ typedef struct drm_radeon_surface_free { | |||
721 | unsigned int address; | 722 | unsigned int address; |
722 | } drm_radeon_surface_free_t; | 723 | } drm_radeon_surface_free_t; |
723 | 724 | ||
725 | #define DRM_RADEON_VBLANK_CRTC1 1 | ||
726 | #define DRM_RADEON_VBLANK_CRTC2 2 | ||
727 | |||
724 | #endif | 728 | #endif |