Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-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-intel/6538497_6554161.patch
author Alan Coopersmith <Alan.Coopersmith@Sun.COM>
Thu, 15 Jan 2009 12:55:00 -0800
changeset 606 068c11b419c9
parent 199 616975bd244f
child 705 24ca414edbff
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: 199
diff changeset 
     1
 
diff -urp -x '*~' -x '*.orig' src/i830_common.h src/i830_common.h
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
     2
 
--- src/i830_common.h	2008-07-22 23:14:09.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: 199
diff changeset 
     3
 
+++ src/i830_common.h	2009-01-10 20:01:43.664950000 -0800
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
     4
 
@@ -94,6 +94,7 @@ typedef struct {
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
     5
 
         int pf_current_page;	/* which buffer is being displayed? */
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
     6
 
         int perf_boxes;	        /* performance boxes to be displayed */
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
     7
 
 	int width, height;      /* screen size in pixels */
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
     8
 
+	int pad0;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
     9
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
    10
 
 	drm_handle_t front_handle;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
    11
 
 	int front_offset;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
    12
 
diff -urp -x '*~' -x '*.orig' src/i830_dri.h src/i830_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: 199
diff changeset 
    13
 
--- src/i830_dri.h	2008-08-25 18:25:53.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: 199
diff changeset 
    14
 
+++ src/i830_dri.h	2009-01-10 20:01:43.652983000 -0800
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
    15
 
@@ -22,16 +22,20 @@ typedef struct _I830DRIRec {
158
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    16
 
    drm_handle_t unused2; /* backbuffer */
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    17
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    18
 
    drmSize unused3; /* depthbufferSize */
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    19
 
+   drmSize pad0;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    20
 
    drm_handle_t unused4; /* depthbuffer */
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    21
199
616975bd244f 6580728 Upgrade Xorg Intel video driver to xf86-video-intel-2.1.0
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 158
diff changeset 
    22
 
-   drmSize unused5; /* rotatedSize /*/
616975bd244f 6580728 Upgrade Xorg Intel video driver to xf86-video-intel-2.1.0
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 158
diff changeset 
    23
 
+   drmSize unused5; /* rotatedSize */
158
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    24
 
+   drmSize pad1;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    25
 
    drm_handle_t unused6; /* rotatedbuffer */
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    26
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    27
 
    drm_handle_t unused7; /* textures */
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    28
 
    int unused8; /* textureSize */
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    29
 
+   drmSize pad2;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    30
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    31
 
    drm_handle_t unused9; /* agp_buffers */
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    32
 
    drmSize unused10; /* agp_buf_size */
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    33
 
+   drmSize pad3;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    34
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    35
 
    int deviceID;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    36
 
    int width;
606
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
    37
 
diff -urp -x '*~' -x '*.orig' src/modes/xf86RandR12.c src/modes/xf86RandR12.c
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
    38
 
--- src/modes/xf86RandR12.c	2008-04-13 18:57:30.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: 199
diff changeset 
    39
 
+++ src/modes/xf86RandR12.c	2009-01-10 20:01:43.666024000 -0800
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 199
diff changeset 
    40
 
@@ -207,6 +207,11 @@ xf86RandR12SetMode (ScreenPtr	    pScree
158
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    41
 
         /* Reset, just so we ensure the drivers SwitchMode is called */
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    42
 
         scrp->currentMode = NULL;
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    43
 
     }
199
616975bd244f 6580728 Upgrade Xorg Intel video driver to xf86-video-intel-2.1.0
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 158
diff changeset 
    44
 
+#if defined (__sun)
158
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    45
 
+    else {
199
616975bd244f 6580728 Upgrade Xorg Intel video driver to xf86-video-intel-2.1.0
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 158
diff changeset 
    46
 
+	currentMode = scrp->currentMode;
158
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    47
 
+    }
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    48
 
+#endif
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    49
 
     /*
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    50
 
      * We know that if the driver failed to SwitchMode to the rotated
a48b0ad24d56 6538497 struct drmI830Sarea and I830DRIRec should be 32-bit & 64-bit clean in Xorg7.2
Abbey.Wang <Abbey.Wang@Sun.Com>
parents:
diff changeset 
    51
 
      * version, then it should revert back to it's prior mode.
upstream/oracle/x-cons/x-s11-update-clone