diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-08 22:44:23 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-08 22:46:10 +0100 |
| commit | ea0209fbc12fca282bd8ef72223791bf163801ce (patch) | |
| tree | 2dd842fa11ba0b206ec6de2793a0273f672e20b9 | |
| parent | 18baa1428b1c4c0a49927d4c32db091db9e4e97b (diff) | |
sna: Remove option to disable vmap
It works everywhere, so when it is finally enabled, let it be.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/intel_options.c | 1 | ||||
| -rw-r--r-- | src/intel_options.h | 1 | ||||
| -rw-r--r-- | src/sna/sna_driver.c | 8 |
3 files changed, 0 insertions, 10 deletions
diff --git a/src/intel_options.c b/src/intel_options.c index 56f1ae9c..78575a63 100644 --- a/src/intel_options.c +++ b/src/intel_options.c @@ -20,7 +20,6 @@ const OptionInfoRec intel_options[] = { #endif #ifdef USE_SNA {OPTION_THROTTLE, "Throttle", OPTV_BOOLEAN, {0}, 1}, - {OPTION_VMAP, "UseVmap", OPTV_BOOLEAN, {0}, 1}, {OPTION_ZAPHOD, "ZaphodHeads", OPTV_STRING, {0}, 0}, {OPTION_DELAYED_FLUSH, "DelayedFlush", OPTV_BOOLEAN, {0}, 1}, #endif diff --git a/src/intel_options.h b/src/intel_options.h index ba2fc4bc..05a2ad14 100644 --- a/src/intel_options.h +++ b/src/intel_options.h @@ -26,7 +26,6 @@ enum intel_options { #endif #ifdef USE_SNA OPTION_THROTTLE, - OPTION_VMAP, OPTION_ZAPHOD, OPTION_DELAYED_FLUSH, #endif diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 8da4f526..32b96e13 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -501,14 +501,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) "Disabling use of relaxed fencing\n"); sna->kgem.has_relaxed_fencing = 0; } - if (!xf86ReturnOptValBool(sna->Options, - OPTION_VMAP, - sna->kgem.has_vmap)) { - xf86DrvMsg(scrn->scrnIndex, - sna->kgem.has_vmap ? X_CONFIG : X_PROBED, - "Disabling use of vmap\n"); - sna->kgem.has_vmap = 0; - } /* Enable tiling by default */ sna->tiling = SNA_TILING_ALL; |