XLibre/xf86-video-i740
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-i740.git synced 2026-03-24 01:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make failure to XAA non-fatal

Browse Source 
No shadowfb support in this driver yet.

Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson
2011-12-19 16:34:10 -05:00
parent 87da594bba
commit cf434e93cd
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/i740.h
View File

@@ -140,6 +140,7 @@ typedef struct _I740Rec {
/*-*/
Bool usevgacompat;
Bool NoAccel;
} I740Rec;
#define I740PTR(p) ((I740Ptr)((p)->driverPrivate))

9
src/i740_driver.c
View File

@@ -725,10 +725,11 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
return FALSE;
}
if (!xf86ReturnOptValBool(pI740->Options, OPTION_NOACCEL, FALSE)) {
pI740->NoAccel = xf86ReturnOptValBool(pI740->Options, OPTION_NOACCEL, FALSE);
if (!pI740->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
I740FreeRec(pScrn);
return FALSE;
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No acceleration available\n");
pI740->NoAccel = 1;
}
}
@@ -1535,7 +1536,7 @@ I740ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
return FALSE;
}
if (!xf86ReturnOptValBool(pI740->Options, OPTION_NOACCEL, FALSE)) {
if (!pI740->NoAccel) {
if (!I740AccelInit(pScreen)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Hardware acceleration initialization failed\n");