diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-19 15:41:41 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-19 15:41:41 -0700 |
| commit | 2ddd85f8aef5da1aebbfe9fab510858e7a41860d (patch) | |
| tree | 64530bd9b865949e4edf2f1f0b9509aea2250ba6 | |
| parent | b8ee31cd80a945d1fbbfc45234ffe34a109b5717 (diff) | |
Bail out if kernel mode setting is active but DRI fails
| -rw-r--r-- | src/i830_driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 289f8b89..561351cd 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3448,11 +3448,15 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (pI830->directRenderingEnabled) { pI830->directRenderingOpen = TRUE; xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Enabled\n"); - } else { + } else if (!pI830->use_drm_mode) { if (pI830->directRenderingDisabled) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Disabled\n"); else xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Failed\n"); + } else { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "failed to enable direct rendering, aborting\n"); + return FALSE; } #else xf86DrvMsg(pScrn->scrnIndex, X_INFO, "direct rendering: Not available\n"); |