diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-08-28 16:01:12 +0300 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-08-28 16:01:12 +0300 |
| commit | 7b38d9a1209f87255e5bb0aefe46a363ce4fb6ef (patch) | |
| tree | 981bce7b10ffe6dc3940cada74d558213208b51b /src/radeon_common.h | |
| parent | 2e3d43af1e5077cc61dd8668551a6291368d9ed2 (diff) | |
| parent | 673f799729824f4439dd5f681f75dd5aab50947f (diff) | |
Merge branch 'master' into pci-rework
Conflicts:
src/ati.c
Diffstat (limited to 'src/radeon_common.h')
| -rw-r--r-- | src/radeon_common.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/radeon_common.h b/src/radeon_common.h index 3f2c6aba..467addf4 100644 --- a/src/radeon_common.h +++ b/src/radeon_common.h @@ -420,6 +420,8 @@ typedef union { #define RADEON_PARAM_SAREA_HANDLE 9 #define RADEON_PARAM_GART_TEX_HANDLE 10 #define RADEON_PARAM_SCRATCH_OFFSET 11 +#define RADEON_PARAM_CARD_TYPE 12 +#define RADEON_PARAM_VBLANK_CRTC 13 /* VBLANK CRTC */ typedef struct drm_radeon_getparam { int param; @@ -473,7 +475,7 @@ typedef struct drm_radeon_set_param { #define RADEON_SETPARAM_PCIGART_LOCATION 3 #define RADEON_SETPARAM_NEW_MEMMAP 4 #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5 - +#define RADEON_SETPARAM_VBLANK_CRTC 6 /* VBLANK CRTC */ /* 1.14: Clients can allocate/free a surface */ typedef struct drm_radeon_surface_alloc { @@ -486,4 +488,7 @@ typedef struct drm_radeon_surface_free { unsigned int address; } drmRadeonSurfaceFree; +#define DRM_RADEON_VBLANK_CRTC1 1 +#define DRM_RADEON_VBLANK_CRTC2 2 + #endif |