diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-29 22:51:26 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-29 22:51:26 +0100 |
| commit | 0fd680ff52f7ce0a101c617dfb8997c4e228e3ad (patch) | |
| tree | d2016fc252f773e44c78f6e7cc21a71706e4cf68 /src/intel_driver.c | |
| parent | 3d45f0affe263985f440e144203ed7cbb3803696 (diff) | |
Don't disable acceleration on 830/845g by default
Run the risk of a GPU hang (it shouldn't endanger the entire machine
normally) and let the user elect to disable it through
Option "NoAccel" "true"
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_driver.c')
| -rw-r--r-- | src/intel_driver.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index 8cb098a1..0e27c48f 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -390,18 +390,9 @@ static Bool can_accelerate_blt(struct intel_screen_private *intel) if (INTEL_INFO(intel)->gen == -1) return FALSE; - if (0 && (IS_I830(intel) || IS_845G(intel))) { - /* These pair of i8xx chipsets have a crippling erratum - * that prevents the use of a PTE entry by the BLT - * engine immediately following updating that - * entry in the GATT. - * - * As the BLT is fundamental to our 2D acceleration, - * and the workaround is lost in the midst of time, - * fallback. - * - * XXX disabled for release as causes regressions in GL. - */ + if (xf86ReturnOptValBool(intel->Options, OPTION_ACCEL_DISABLE, FALSE)) { + xf86DrvMsg(intel->scrn->scrnIndex, X_CONFIG, + "Disabling hardware acceleration.\n"); return FALSE; } |