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/6819154.patch
author Niveditha Rau <Niveditha.Rau@Sun.COM>
Wed, 18 Mar 2009 14:55:52 -0700
changeset 671 e478413c547f
permissions -rw-r--r--
6819154 cannot do default install osol_108 or later with Intel GM45
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
671
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     1
 
--- src/i830_driver.c	Tue Mar 17 12:19:57 2009
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     2
 
+++ src/i830_driver.c	Tue Mar 17 13:32:09 2009
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     3
 
@@ -2869,7 +2869,8 @@
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     4
 
    }
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     5
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     6
 
    /* Enable FB compression if possible */
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     7
 
-   if (i830_fb_compression_supported(pI830))
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     8
 
+   if (i830_fb_compression_supported(pI830) && !IS_GM45(pI830)
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
     9
 
+		&& !IS_G4X(pI830))
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    10
 
        pI830->fb_compression = TRUE;
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    11
 
    else
e478413c547f 6819154 cannot do default install osol_108 or later with Intel GM45
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff changeset 
    12
 
        pI830->fb_compression = FALSE;
upstream/oracle/x-cons/x-s11-update-clone