fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-27 04:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct types that are shared with user mode.

Browse source
This commit is contained in:
Ian Romanick 2007-07-09 16:22:48 -07:00
parent a3f56dc3d0
commit 7268b65d5c
3 changed files with 33 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linux-core/xgi_cmdlist.c
View file

@ -37,7 +37,8 @@ struct xgi_cmdring_info s_cmdring;
static void addFlush2D(struct xgi_info * info);
static unsigned int getCurBatchBeginPort(struct xgi_cmd_info * pCmdInfo);
static void triggerHWCommandList(struct xgi_info * info, U32 triggerCounter);
static void triggerHWCommandList(struct xgi_info * info,
unsigned int triggerCounter);
static void xgi_cmdlist_reset(void);
int xgi_cmdlist_initialize(struct xgi_info * info, size_t size)
@ -276,7 +277,8 @@ void xgi_cmdlist_cleanup(struct xgi_info * info)
}
}
static void triggerHWCommandList(struct xgi_info * info, U32 triggerCounter)
static void triggerHWCommandList(struct xgi_info * info,
unsigned int triggerCounter)
{
static unsigned int s_triggerID = 1;

63
linux-core/xgi_drv.h
View file

@ -100,16 +100,16 @@ struct xgi_aperture {
};
struct xgi_screen_info {
U32 scrn_start;
U32 scrn_xres;
U32 scrn_yres;
U32 scrn_bpp;
U32 scrn_pitch;
unsigned int scrn_start;
unsigned int scrn_xres;
unsigned int scrn_yres;
unsigned int scrn_bpp;
unsigned int scrn_pitch;
};
struct xgi_sarea_info {
U32 bus_addr;
U32 size;
unsigned long bus_addr;
unsigned int size;
};
struct xgi_info {
@ -153,8 +153,8 @@ struct xgi_info {
};
struct xgi_ioctl_post_vbios {
U32 bus;
U32 slot;
unsigned int bus;
unsigned int slot;
};
enum xgi_mem_location {
@ -176,9 +176,6 @@ enum PcieOwner {
PCIE_INVALID = 0x7fffffff
};
struct xgi_mem_req {
};
struct xgi_mem_alloc {
unsigned int location;
unsigned int size;
@ -197,45 +194,41 @@ struct xgi_mem_alloc {
};
struct xgi_chip_info {
U32 device_id;
char device_name[32];
U32 vendor_id;
U32 curr_display_mode; //Singe, DualView(Contained), MHS
U32 fb_size;
U32 sarea_bus_addr;
U32 sarea_size;
};
u16 device_id;
u16 vendor_id;
struct xgi_opengl_cmd {
U32 cmd;
char device_name[32];
unsigned int curr_display_mode; //Singe, DualView(Contained), MHS
unsigned int fb_size;
unsigned long sarea_bus_addr;
unsigned int sarea_size;
};
struct xgi_mmio_info {
struct xgi_opengl_cmd cmd_head;
void *mmioBase;
int size;
unsigned long mmio_base;
unsigned int size;
};
typedef enum {
enum xgi_batch_type {
BTYPE_2D = 0,
BTYPE_3D = 1,
BTYPE_FLIP = 2,
BTYPE_CTRL = 3,
BTYPE_NONE = 0x7fffffff
} BATCH_TYPE;
};
struct xgi_cmd_info {
BATCH_TYPE _firstBeginType;
U32 _firstBeginAddr;
U32 _firstSize;
U32 _curDebugID;
U32 _lastBeginAddr;
U32 _beginCount;
unsigned int _firstBeginType;
u32 _firstBeginAddr;
u32 _firstSize;
u32 _curDebugID;
u32 _lastBeginAddr;
unsigned int _beginCount;
};
struct xgi_state_info {
U32 _fromState;
U32 _toState;
unsigned int _fromState;
unsigned int _toState;
};
struct xgi_mem_pid {

2
linux-core/xgi_misc.c
View file

@ -48,7 +48,7 @@ void xgi_get_device_info(struct xgi_info * info, struct xgi_chip_info * req)
void xgi_get_mmio_info(struct xgi_info * info, struct xgi_mmio_info * req)
{
req->mmioBase = (void *)info->mmio.base;
req->mmio_base = info->mmio.base;
req->size = info->mmio.size;
}