diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-07-11 11:23:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-07-11 11:23:41 +1000 |
| commit | 2c9e05cf4c6eb18c941321f764ed1b282a314ba9 (patch) | |
| tree | d5bcbe9114fac7e03549ae05a9e6dffc793fcbaf /shared-core/radeon_drm.h | |
| parent | 9b9a127ed0fe9a6a8e2fde84739ccff6fa0bc5ac (diff) | |
| parent | 694e1c5c3f768436651ddf95e11ab5a89ccc8ffa (diff) | |
Merge branch 'master' into cleanup
Conflicts:
libdrm/xf86drm.c
linux-core/drm_bo.c
linux-core/drm_fence.c
Diffstat (limited to 'shared-core/radeon_drm.h')
| -rw-r--r-- | shared-core/radeon_drm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h index e96e7851..6a57b804 100644 --- a/shared-core/radeon_drm.h +++ b/shared-core/radeon_drm.h @@ -655,6 +655,7 @@ typedef struct drm_radeon_indirect { #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; @@ -709,7 +710,7 @@ typedef struct drm_radeon_setparam { #define RADEON_SETPARAM_NEW_MEMMAP 4 /* Use new memory map */ #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5 /* PCI GART Table Size */ - +#define RADEON_SETPARAM_VBLANK_CRTC 6 /* VBLANK CRTC */ /* 1.14: Clients can allocate/free a surface */ typedef struct drm_radeon_surface_alloc { @@ -722,5 +723,7 @@ typedef struct drm_radeon_surface_free { unsigned int address; } drm_radeon_surface_free_t; +#define DRM_RADEON_VBLANK_CRTC1 1 +#define DRM_RADEON_VBLANK_CRTC2 2 #endif |