diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-07-01 15:11:07 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-07-01 16:52:35 +0100 |
| commit | a10781b70f222f3997928fa979f6292617f79316 (patch) | |
| tree | ebd2d4f547ed242706f38e037592cf22cc1157a0 /src/sna/sna_driver.c | |
| parent | 75745cd5861481c5a9a31125d357f339349dd0f8 (diff) | |
sna: Enforce LinearFramebuffer option
This option should only be used for compatibility. Previously this was
done at a high level, this changes it to enforce the tiling as we apply
the CRTC.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_driver.c')
| -rw-r--r-- | src/sna/sna_driver.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index c57832b1..ce319d22 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -614,22 +614,8 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) sna->kgem.wedged = true; } - /* Enable tiling by default */ - sna->tiling = SNA_TILING_ALL; - - /* Allow user override if they set a value */ - if (!xf86ReturnOptValBool(sna->Options, OPTION_TILING_2D, TRUE)) - sna->tiling &= ~SNA_TILING_2D; if (xf86ReturnOptValBool(sna->Options, OPTION_TILING_FB, FALSE)) - sna->tiling &= ~SNA_TILING_FB; - - if (sna->tiling != SNA_TILING_ALL) { - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s, pixmaps %s\n", - sna->tiling & SNA_TILING_FB ? "tiled" : "linear", - sna->tiling & SNA_TILING_2D ? "tiled" : "linear"); - xf86DrvMsg(scrn->scrnIndex, X_WARNING, - "Tiling disabled, expect poor performance and increased power consumption.\n"); - } + sna->flags |= SNA_LINEAR_FB; if (xf86ReturnOptValBool(sna->Options, OPTION_DELETE_DP12, FALSE)) sna->flags |= SNA_REMOVE_OUTPUTS; @@ -665,7 +651,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) } scrn->currentMode = scrn->modes; - if (sna->flags & SNA_HAS_FLIP && + if ((sna->flags & (SNA_HAS_FLIP | SNA_LINEAR_FB)) == SNA_HAS_FLIP && xf86ReturnOptValBool(sna->Options, OPTION_TEAR_FREE, enable_tear_free(sna))) sna->flags |= SNA_TEAR_FREE; xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "TearFree %sabled\n", |