diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-09 08:27:02 +0000 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2011-05-29 23:29:07 +0100 |
| commit | 90829643d08dd1bef06bb9c27d8a8d8abaf935a1 (patch) | |
| tree | 7777a3a41c244acca7ab3ba9810d2360b278c50d /src/intel_memory.c | |
| parent | 15f093148847f47b67c9be72c1c86173d4df5302 (diff) | |
Give each user of tiling separate xorg.conf options
So that you can indeed allocate a linear framebuffer if you so desire
without breaking mesa.
Adds:
Section "Driver"
Option "LinearFramebuffer" "False|True" # default false
EndSection
to xorg.conf
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 049ce4397ddf7fd088ce364cbb53cacf5133176f)
Conflicts:
man/intel.man
src/intel_driver.c
src/intel_driver.h
Diffstat (limited to 'src/intel_memory.c')
| -rw-r--r-- | src/intel_memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel_memory.c b/src/intel_memory.c index 90e7be7d..017a2898 100644 --- a/src/intel_memory.c +++ b/src/intel_memory.c @@ -897,7 +897,7 @@ drm_intel_bo *intel_allocate_framebuffer(ScrnInfoPtr scrn, uint32_t tiling_mode; unsigned long pitch; - if (intel->tiling) + if (intel->tiling & INTEL_TILING_FB) tiling_mode = I915_TILING_X; else tiling_mode = I915_TILING_NONE; @@ -943,7 +943,7 @@ retry: return NULL; } - if (intel->tiling && tiling_mode != I915_TILING_X) { + if ((intel->tiling & INTEL_TILING_FB) && tiling_mode != I915_TILING_X) { xf86DrvMsg(scrn->scrnIndex, X_WARNING, "Failed to set tiling on frontbuffer.\n"); } |