diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-12 18:02:21 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-12 18:02:21 -0700 |
| commit | f744aa8d4b22374e1de6dda4facb673c3c428d4d (patch) | |
| tree | 6e06b9f7315ac02d00e37f2356acf8d6e00943b2 | |
| parent | 2321c865f3da9fd321910236a92b32e0af1aa458 (diff) | |
Don't run old accel init code
Had the wrong logic. Throw in a couple of cleanups while we're there.
| -rw-r--r-- | src/i830_driver.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 26811352..3ad811e4 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1878,8 +1878,10 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) if (pI830->use_drm_mode) { if (!I830DrmModeInit(pScrn)) return FALSE; - } else if (!I830AccelMethodInit(pScrn)) - return FALSE; + } else { + if (!I830AccelMethodInit(pScrn)) + return FALSE; + } I830XvInit(pScrn); @@ -2661,9 +2663,6 @@ I830BlockHandler(int i, #endif pI830->need_mi_flush = FALSE; -#ifdef XF86DRI - drmCommandNone(pI830->drmSubFD, DRM_I915_GEM_THROTTLE); -#endif } if (pI830->accel == ACCEL_UXA) @@ -2675,7 +2674,7 @@ I830BlockHandler(int i, * (except for mode setting, where it may occur naturally). * Check & ack the condition. */ - if (pScrn->vtSema && !DSPARB_HWCONTROL(pI830)) { + if (!pI830->use_drm_mode && pScrn->vtSema && !DSPARB_HWCONTROL(pI830)) { if (xf86_config->crtc[0]->enabled && (INREG(PIPEASTAT) & FIFO_UNDERRUN)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "underrun on pipe A!\n"); @@ -3641,7 +3640,8 @@ I830EnterVT(int scrnIndex, int flags) intel_batch_init(pScrn); - if ((pI830->accel == ACCEL_EXA || pI830->accel == ACCEL_UXA) && IS_I965G(pI830)) + if ((pI830->accel == ACCEL_EXA || pI830->accel == ACCEL_UXA) && + IS_I965G(pI830)) gen4_render_state_init(pScrn); if (!pI830->use_drm_mode) { |