diff options
| author | Owain G. Ainsworth <oga@openbsd.org> | 2011-03-16 21:36:13 +0000 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2011-03-16 21:36:13 +0000 |
| commit | 64d3e15611b1910fd0e825b0a0e407237d549c92 (patch) | |
| tree | 420fa68f8825e8e86895b6120ecc79aba7874443 | |
| parent | c4c9cb20d00784ed40631a72d9cb061c8b6d1b6c (diff) | |
Always use tiling on Sandybridge
Sandybridge requires kind of buffer must be tiling, like depth.
And we would or have all tiling cases handled fine. So not allow
user to turn off tiling on Sandybridge+ may be fine.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
(cherry picked from commit 345c963e443ec325f1ff530512a356ddb318ff70)
Conflicts:
src/intel_driver.c
| -rw-r--r-- | src/intel_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index d68a5808..0f1e83b2 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -2210,12 +2210,12 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) intel->tiling = TRUE; /* Allow user override if they set a value */ - if (xf86IsOptionSet(intel->Options, OPTION_TILING)) { + /* Allow user override if they set a value */ + if (!ALWAYS_TILING(intel) && xf86IsOptionSet(intel->Options, OPTION_TILING)) { if (xf86ReturnOptValBool(intel->Options, OPTION_TILING, FALSE)) intel->tiling = TRUE; else intel->tiling = FALSE; - } if (xf86IsOptionSet(intel->Options, OPTION_SHADOW)) { if (xf86ReturnOptValBool(intel->Options, OPTION_SHADOW, FALSE)) |