summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/intel_driver.c4
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))