diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-05 19:26:48 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-15 20:56:58 +0100 |
| commit | 0c32be15b06ad63c1fc1371de879f2d879080f6b (patch) | |
| tree | a86f39daf524a54d1a54999df98462487d39e3b4 /src/intel_driver.c | |
| parent | 6a18a0936eafc45ab920ab0eecf2fc2a601c41a7 (diff) | |
uxa: Remove Shadow hack
This was an incomplete hack so deprecate in favour of Shadow-on-Steriods,
SNA.
References: https://bugs.freedesktop.org/show_bug.cgi?id=47324
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_driver.c')
| -rw-r--r-- | src/intel_driver.c | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index 78f7ce39..89b72d89 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -569,23 +569,12 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) intel->tiling &= ~INTEL_TILING_2D; if (xf86ReturnOptValBool(intel->Options, OPTION_TILING_FB, FALSE)) intel->tiling &= ~INTEL_TILING_FB; - - intel->can_blt = can_accelerate_blt(intel); - intel->has_kernel_flush = has_kernel_flush(intel); - intel->use_shadow = !intel->can_blt; - - if (xf86IsOptionSet(intel->Options, OPTION_SHADOW)) { - intel->use_shadow = - xf86ReturnOptValBool(intel->Options, - OPTION_SHADOW, - FALSE); + if (!can_accelerate_blt(intel)) { + intel->force_fallback = true; + intel->tiling &= ~INTEL_TILING_FB; } - if (intel->use_shadow) { - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, - "Shadow buffer enabled," - " 2D GPU acceleration disabled.\n"); - } + intel->has_kernel_flush = has_kernel_flush(intel); intel->has_relaxed_fencing = xf86ReturnOptValBool(intel->Options, @@ -1126,26 +1115,11 @@ static Bool I830CloseScreen(CLOSE_SCREEN_ARGS_DECL) } if (intel->front_buffer) { - if (!intel->use_shadow) - intel_set_pixmap_bo(screen->GetScreenPixmap(screen), - NULL); intel_mode_remove_fb(intel); drm_intel_bo_unreference(intel->front_buffer); intel->front_buffer = NULL; } - if (intel->shadow_buffer) { - free(intel->shadow_buffer); - intel->shadow_buffer = NULL; - } - - if (intel->shadow_damage) { - DamageUnregister(&screen->GetScreenPixmap(screen)->drawable, - intel->shadow_damage); - DamageDestroy(intel->shadow_damage); - intel->shadow_damage = NULL; - } - intel_batch_teardown(scrn); if (INTEL_INFO(intel)->gen >= 40) |