From f6e9316ed44ff491e26a7f43db71a4883147ca5b Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 19 Nov 2015 23:20:07 +0000 Subject: Re-enable acceleration! Double negatives are most confusing before coffee. In removing the double negation from the xorg.conf, I inverted the option in the code but didn't invert the test. As a result, acceleration was now disabled unless you explicitly asked for NoAccel. Reported-by: Jan Steffens Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 2 +- src/uxa/intel_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 7e20715f..33418512 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -17985,7 +17985,7 @@ static bool sna_option_accel_none(struct sna *sna) if (wedged(sna)) return true; - if (xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_ENABLE, TRUE)) + if (!xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_ENABLE, TRUE)) return true; if (sna->kgem.gen >= 0120) diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c index 70bce84e..8f76b34e 100644 --- a/src/uxa/intel_driver.c +++ b/src/uxa/intel_driver.c @@ -364,7 +364,7 @@ static Bool can_accelerate_blt(struct intel_screen_private *intel) if (INTEL_INFO(intel)->gen == -1) return FALSE; - if (xf86ReturnOptValBool(intel->Options, OPTION_ACCEL_ENABLE, TRUE) || + if (!xf86ReturnOptValBool(intel->Options, OPTION_ACCEL_ENABLE, TRUE) || !intel_option_cast_to_bool(intel->Options, OPTION_ACCEL_METHOD, TRUE)) { xf86DrvMsg(intel->scrn->scrnIndex, X_CONFIG, "Disabling hardware acceleration.\n"); -- cgit v1.2.3