| author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
| Fri, 25 Mar 2011 17:37:55 -0700 | |
| changeset 1097 | 243d7ed7a10c |
| parent 1088 | 1c99106ccbe0 |
| child 1124 | 7bc7e624f965 |
| permissions | -rw-r--r-- |
|
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
881
diff
changeset
|
1 |
diff -Nurp -x '*~' -x '*.orig' exa/exa.c exa/exa.c |
|
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
881
diff
changeset
|
2 |
--- exa/exa.c 2010-07-14 13:23:17.000000000 -0700 |
|
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
881
diff
changeset
|
3 |
+++ exa/exa.c 2010-09-03 16:45:44.147202216 -0700 |
|
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
881
diff
changeset
|
4 |
@@ -61,7 +61,11 @@ exaGetPixmapOffset(PixmapPtr pPix) |
|
881
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
5 |
ExaScreenPriv (pPix->drawable.pScreen); |
|
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
6 |
ExaPixmapPriv (pPix); |
|
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
7 |
|
|
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
8 |
- return (CARD8 *)pExaPixmap->fb_ptr - pExaScr->info->memoryBase; |
|
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
9 |
+ /* added in as a fix for 6912996 */ |
|
1088
1c99106ccbe0
6983602 Xorg 1.9 integration [PSARC/2011/008]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
881
diff
changeset
|
10 |
+ if (exaPixmapHasGpuCopy(pExaPixmap) && pExaPixmap->fb_ptr) |
|
881
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
11 |
+ return (CARD8 *)pExaPixmap->fb_ptr - pExaScr->info->memoryBase; |
|
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
12 |
+ else |
|
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
13 |
+ return (CARD8 *)pExaPixmap->sys_ptr - pExaScr->info->memoryBase; |
|
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
14 |
} |
|
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
15 |
|
|
1a541f8ae0aa
6912996 Trying to bring up gdm on ironlake or GM45 with OpenSolaris 130 results in a black screen
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
16 |
void * |