Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/driver/xf86-video-ati/solaris-dri-drv-port.patch
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Thu, 15 Jan 2009 12:55:00 -0800
changeset 606 068c11b419c9
parent 403 5a3d5128161c
child 999 c88b52baf4f4
permissions -rw-r--r--
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Includes changes contributed by Liang, Kan <[email protected]>: - G41 support patches - DRM_CAS in libdrm type error can cause deadlock and hang the glxgears. Includes changes contributed by Martin Bochnig <[email protected]>: - Make SUNWxorg-mesa package platform-clean
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 403
diff changeset 
     1
 
diff -urp -x '*~' -x '*.orig' src/radeon_dri.h src/radeon_dri.h
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 403
diff changeset 
     2
 
--- src/radeon_dri.h	2008-08-17 10:54:00.000000000 -0700
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 403
diff changeset 
     3
 
+++ src/radeon_dri.h	2009-01-10 19:09:08.415906000 -0800
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 403
diff changeset 
     4
 
@@ -75,20 +75,25 @@ typedef struct {
403
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
     5
 
     /* MMIO register data */
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
     6
 
     drm_handle_t     registerHandle;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
     7
 
     drmSize       registerSize;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
     8
 
+	int		padding0;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
     9
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    10
 
     /* CP in-memory status information */
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    11
 
     drm_handle_t     statusHandle;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    12
 
     drmSize       statusSize;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    13
 
+	int		padding1;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    14
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    15
 
     /* CP GART Texture data */
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    16
 
     drm_handle_t     gartTexHandle;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    17
 
     drmSize       gartTexMapSize;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    18
 
+	int		padding2;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    19
 
     int           log2GARTTexGran;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    20
 
     int           gartTexOffset;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    21
 
     unsigned int  sarea_priv_offset;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    22
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    23
 
 #ifdef PER_CONTEXT_SAREA
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    24
 
     drmSize      perctx_sarea_size;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    25
 
+#else
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    26
 
+	int		padding3;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    27
 
 #endif
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    28
 
 } RADEONDRIRec, *RADEONDRIPtr;
5a3d5128161c 6673139 Mesa3D driver for ATI Radeon graphics cards
minskey guo <Minskey.Guo@Sun.COM>
parents:
diff changeset 
    29
upstream/oracle/x-cons/x-s12-clone