From b068f31202028614ffa9339bdef88cb6d76e9f63 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Sat, 6 Dec 2003 13:24:24 +0000 Subject: merge XFree86 4.3.99.901 (RC1) from vendor branch --- src/radeon_common.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/radeon_common.h b/src/radeon_common.h index d9261234..12ec49fd 100644 --- a/src/radeon_common.h +++ b/src/radeon_common.h @@ -31,13 +31,15 @@ * Converted to common header format: * Jens Owen * - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.4 2003/11/10 18:41:22 tsi Exp $ + * $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.8 2003/12/02 22:29:22 dawes Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.8 2003/12/02 22:29:22 dawes Exp $ * */ #ifndef _RADEON_COMMON_H_ #define _RADEON_COMMON_H_ +#include #include "xf86drm.h" /* WARNING: If you change any of these defines, make sure to change @@ -71,6 +73,7 @@ #define DRM_RADEON_IRQ_EMIT 0x16 #define DRM_RADEON_IRQ_WAIT 0x17 #define DRM_RADEON_CP_RESUME 0x18 +#define DRM_RADEON_SETPARAM 0x19 #define DRM_RADEON_MAX_DRM_COMMAND_INDEX 0x39 @@ -159,7 +162,7 @@ typedef struct { } drmRadeonTexImage; typedef struct { - int offset; + unsigned int offset; int pitch; int format; int width; /* Texture image coordinates */ @@ -445,4 +448,16 @@ typedef struct drm_radeon_irq_wait { } drmRadeonIrqWait; +/* 1.10: Clients tell the DRM where they think the framebuffer is located in + * the card's address space, via a new generic ioctl to set parameters + */ + +typedef struct drm_radeon_set_param { + unsigned int param; + int64_t value; +} drmRadeonSetParam; + +#define RADEON_SETPARAM_FB_LOCATION 1 + + #endif -- cgit v1.2.3