diff options
author | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2007-11-22 17:17:06 +1100 |
commit | a20587e3950f849deb1e723a0b4455a19f7b3fb8 (patch) | |
tree | de0a9d0b6558f3b359acf7985ddf4b8e7e83ee24 /shared-core/radeon_drm.h | |
parent | 8fd8bf599b42b6caa062afabdfce7385d59a7695 (diff) | |
parent | 5dc5c36e624e5393b5427a159ad34e5fc358cc9f (diff) |
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drmP.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/radeon_drv.h
Diffstat (limited to 'shared-core/radeon_drm.h')
-rw-r--r-- | shared-core/radeon_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h index 50e561af..67536c26 100644 --- a/shared-core/radeon_drm.h +++ b/shared-core/radeon_drm.h @@ -665,6 +665,7 @@ typedef struct drm_radeon_indirect { #define RADEON_PARAM_SCRATCH_OFFSET 11 #define RADEON_PARAM_CARD_TYPE 12 #define RADEON_PARAM_VBLANK_CRTC 13 /* VBLANK CRTC */ +#define RADEON_PARAM_FB_LOCATION 14 /* FB location */ typedef struct drm_radeon_getparam { int param; |