Attachment #49518 for bug #106890

View | Details | Raw Unified | Return to bug 106890
Collapse All | Expand All




 */
#define MGA_BUFFER_ALIGN	0x00000fff

typedef struct _mgaDrmRegion {
    drmHandle     handle;
    unsigned int  offset;
    drmSize       size;
} mgaDrmRegion, *mgaDrmRegionPtr;

typedef struct {
   int chipset;
   int width;


   unsigned int mAccess;

   mgaDrmRegion registers;
   mgaDrmRegion status;
   mgaDrmRegion primary;
   mgaDrmRegion buffers;
   unsigned int sarea_priv_offset;
} MGADRIRec, *MGADRIPtr;






} MGADRIServerPrivateRec, *MGADRIServerPrivatePtr;

typedef struct _mgaDrmRegion {
    drmHandle     handle;
    unsigned int  offset;
    drmSize       size;
} mgaDrmRegion, *mgaDrmRegionPtr;

typedef struct {
   int chipset;
   int width;


   unsigned int mAccess;

   mgaDrmRegion registers;
   mgaDrmRegion status;
   mgaDrmRegion primary;
   mgaDrmRegion buffers;
   unsigned int sarea_priv_offset;
} MGADRIRec, *MGADRIPtr;


Lines 58-63 Link Here

(-)extras/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h (+1 lines)
58		58
59	#define DRM_AGP_NO_HANDLE 0	59	#define DRM_AGP_NO_HANDLE 0
60		60
		61	typedef unsigned int drmHandle, drmHandlePtr; / To mapped regions */
61	typedef unsigned int drmSize, drmSizePtr; /< For mapped regions /	62	typedef unsigned int drmSize, drmSizePtr; /< For mapped regions /
62	typedef void drmAddress, drmAddressPtr; /< For mapped regions /	63	typedef void drmAddress, drmAddressPtr; /< For mapped regions /
63		64

Lines 58-63 Link Here

(-)programs/Xserver/hw/xfree86/os-support/xf86drm.h (+1 lines)
58		58
59	#define DRM_AGP_NO_HANDLE 0	59	#define DRM_AGP_NO_HANDLE 0
60		60
		61	typedef unsigned int drmHandle, drmHandlePtr; / To mapped regions */
61	typedef unsigned int drmSize, drmSizePtr; /< For mapped regions /	62	typedef unsigned int drmSize, drmSizePtr; /< For mapped regions /
62	typedef void drmAddress, drmAddressPtr; /< For mapped regions /	63	typedef void drmAddress, drmAddressPtr; /< For mapped regions /
63		64

Return to bug 106890

Lines 43-48 Link Here

(-)extras/Mesa/src/mesa/drivers/dri/mga/server/mga_dri.h (-4 / +10 lines)
43	*/	43	*/
44	#define MGA_BUFFER_ALIGN 0x00000fff	44	#define MGA_BUFFER_ALIGN 0x00000fff
45		45
		46	typedef struct _mgaDrmRegion {
		47	drmHandle handle;
		48	unsigned int offset;
		49	drmSize size;
		50	} mgaDrmRegion, *mgaDrmRegionPtr;
		51
46	typedef struct {	52	typedef struct {
47	int chipset;	53	int chipset;
48	int width;	54	int width;
Lines 75-84 Link Here
75		81
76	unsigned int mAccess;	82	unsigned int mAccess;
77		83
78	drmRegion registers;	84	mgaDrmRegion registers;
79	drmRegion status;	85	mgaDrmRegion status;
80	drmRegion primary;	86	mgaDrmRegion primary;
81	drmRegion buffers;	87	mgaDrmRegion buffers;
82	unsigned int sarea_priv_offset;	88	unsigned int sarea_priv_offset;
83	} MGADRIRec, *MGADRIPtr;	89	} MGADRIRec, *MGADRIPtr;
84		90

Lines 79-84 Link Here

(-)programs/Xserver/hw/xfree86/drivers/mga/mga_dri.h (-4 / +10 lines)
79		79
80	} MGADRIServerPrivateRec, *MGADRIServerPrivatePtr;	80	} MGADRIServerPrivateRec, *MGADRIServerPrivatePtr;
81		81
		82	typedef struct _mgaDrmRegion {
		83	drmHandle handle;
		84	unsigned int offset;
		85	drmSize size;
		86	} mgaDrmRegion, *mgaDrmRegionPtr;
		87
82	typedef struct {	88	typedef struct {
83	int chipset;	89	int chipset;
84	int width;	90	int width;
Lines 111-120 Link Here
111		117
112	unsigned int mAccess;	118	unsigned int mAccess;
113		119
114	drmRegion registers;	120	mgaDrmRegion registers;
115	drmRegion status;	121	mgaDrmRegion status;
116	drmRegion primary;	122	mgaDrmRegion primary;
117	drmRegion buffers;	123	mgaDrmRegion buffers;
118	unsigned int sarea_priv_offset;	124	unsigned int sarea_priv_offset;
119	} MGADRIRec, *MGADRIPtr;	125	} MGADRIRec, *MGADRIPtr;
120		126