diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-03 12:45:10 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-07-03 12:45:10 +0100 |
| commit | 2ecff61d369d9f67c6e28d407941f35ed6195156 (patch) | |
| tree | ee36f5b9973de8321fa67d501144490c024e0afe /src | |
| parent | c957f4171791447f1869f11fd724dbe92e6a8b91 (diff) | |
intel: Retire Option "RelaxedFencing"
The kernel bugs have long since been fixed and should have been
propagated to all stable kernels long ago. Now there should be no need
to workaround those bugs.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel_driver.c | 5 | ||||
| -rw-r--r-- | src/intel_options.c | 1 | ||||
| -rw-r--r-- | src/intel_options.h | 1 | ||||
| -rw-r--r-- | src/sna/sna_driver.c | 9 |
4 files changed, 1 insertions, 15 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index 7569c130..f4d76bb4 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -585,10 +585,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) intel->has_prime_vmap_flush = has_prime_vmap_flush(intel); - intel->has_relaxed_fencing = - xf86ReturnOptValBool(intel->Options, - OPTION_RELAXED_FENCING, - INTEL_INFO(intel)->gen >= 033); + intel->has_relaxed_fencing = INTEL_INFO(intel)->gen >= 033; /* And override the user if there is no kernel support */ if (intel->has_relaxed_fencing) intel->has_relaxed_fencing = has_relaxed_fencing(intel); diff --git a/src/intel_options.c b/src/intel_options.c index fda2e8b0..ca172b5c 100644 --- a/src/intel_options.c +++ b/src/intel_options.c @@ -17,7 +17,6 @@ const OptionInfoRec intel_options[] = { {OPTION_TRIPLE_BUFFER, "TripleBuffer", OPTV_BOOLEAN, {0}, 1}, {OPTION_PREFER_OVERLAY, "XvPreferOverlay", OPTV_BOOLEAN, {0}, 0}, {OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0}, 1}, - {OPTION_RELAXED_FENCING,"RelaxedFencing", OPTV_BOOLEAN, {0}, 1}, #ifdef INTEL_XVMC {OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, 1}, #endif diff --git a/src/intel_options.h b/src/intel_options.h index 8fa7a8fb..8cee054a 100644 --- a/src/intel_options.h +++ b/src/intel_options.h @@ -23,7 +23,6 @@ enum intel_options { OPTION_TRIPLE_BUFFER, OPTION_PREFER_OVERLAY, OPTION_HOTPLUG, - OPTION_RELAXED_FENCING, #if defined(XvMCExtension) && defined(ENABLE_XVMC) OPTION_XVMC, #define INTEL_XVMC 1 diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 2874c64b..aafa3651 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -483,15 +483,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) sna->kgem.wedged = true; } - if (!xf86ReturnOptValBool(sna->Options, - OPTION_RELAXED_FENCING, - sna->kgem.has_relaxed_fencing)) { - xf86DrvMsg(scrn->scrnIndex, - sna->kgem.has_relaxed_fencing ? X_CONFIG : X_PROBED, - "Disabling use of relaxed fencing\n"); - sna->kgem.has_relaxed_fencing = 0; - } - /* Enable tiling by default */ sna->tiling = SNA_TILING_ALL; |