diff options
| -rw-r--r-- | man/intel.man | 8 | ||||
| -rw-r--r-- | src/intel_options.c | 2 | ||||
| -rw-r--r-- | src/intel_options.h | 2 | ||||
| -rw-r--r-- | src/sna/sna_accel.c | 2 | ||||
| -rw-r--r-- | src/uxa/intel_driver.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/man/intel.man b/man/intel.man index 318a5b71..8da496e6 100644 --- a/man/intel.man +++ b/man/intel.man @@ -112,8 +112,8 @@ The default is 8192 if AGP allocable memory is < 128 MB, 16384 if < 192 MB, 24576 if higher. DRI require at least a value of 16384. Higher values may give better 3D performance, at expense of available system memory. .TP -.BI "Option \*qNoAccel\*q \*q" boolean \*q -Disable or enable acceleration. +.BI "Option \*qAccel\*q \*q" boolean \*q +Enable or disable acceleration. .IP Default: acceleration is enabled. @@ -122,8 +122,8 @@ The following driver .B Options are supported for the 830M and later chipsets: .TP -.BI "Option \*qNoAccel\*q \*q" boolean \*q -Disable or enable acceleration. +.BI "Option \*qAccel\*q \*q" boolean \*q +Enable or disable acceleration. .IP Default: acceleration is enabled. .TP diff --git a/src/intel_options.c b/src/intel_options.c index d19736bf..7f253ac1 100644 --- a/src/intel_options.c +++ b/src/intel_options.c @@ -9,7 +9,7 @@ #include "intel_options.h" const OptionInfoRec intel_options[] = { - {OPTION_ACCEL_DISABLE, "NoAccel", OPTV_BOOLEAN, {0}, 0}, + {OPTION_ACCEL_ENABLE, "Accel", OPTV_BOOLEAN, {0}, 0}, {OPTION_ACCEL_METHOD, "AccelMethod", OPTV_STRING, {0}, 0}, {OPTION_BACKLIGHT, "Backlight", OPTV_STRING, {0}, 0}, {OPTION_EDID, "CustomEDID", OPTV_STRING, {0}, 0}, diff --git a/src/intel_options.h b/src/intel_options.h index a831c55f..43635f1f 100644 --- a/src/intel_options.h +++ b/src/intel_options.h @@ -12,7 +12,7 @@ */ enum intel_options { - OPTION_ACCEL_DISABLE, + OPTION_ACCEL_ENABLE, OPTION_ACCEL_METHOD, OPTION_BACKLIGHT, OPTION_EDID, diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 7d7731b1..7e20715f 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_DISABLE, FALSE)) + 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 8e685bd6..70bce84e 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_DISABLE, FALSE) || + 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"); |