diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-19 11:28:30 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-09-19 11:28:30 +0100 |
| commit | 6316905983fe1fb4828ff1039923327f467306fa (patch) | |
| tree | c8c80b80b8216c96d57438c4fe7b945824c7f8f6 | |
| parent | afad7dd43d935a4666bff6c2964714209e851221 (diff) | |
intel: Fix includes for intel_options
In commit dcf9b5ae1889926007cf8a0efd127e9df3c909de
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Sep 17 22:27:45 2013 +0100
intel: Compile fixes for base install of SLED11.sp3
the includes were juggled around to avoid pulling in xorg-server.h
outside of the driver. However, missing xorg-server.h leads to subtle
bugs in the layout of structures, in this case breaking xf86Options.
Reported-by: FBrown <francisbrwn9@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69555
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/intel_options.c | 6 | ||||
| -rw-r--r-- | src/intel_options.h | 1 | ||||
| -rw-r--r-- | src/sna/sna_display.c | 1 | ||||
| -rw-r--r-- | src/sna/sna_driver.c | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/intel_options.c b/src/intel_options.c index 6d53a3f3..02a4ae18 100644 --- a/src/intel_options.c +++ b/src/intel_options.c @@ -13,15 +13,15 @@ const OptionInfoRec intel_options[] = { {OPTION_VIDEO_KEY, "VideoKey", OPTV_INTEGER, {0}, 0}, {OPTION_TILING_2D, "Tiling", OPTV_BOOLEAN, {0}, 1}, {OPTION_TILING_FB, "LinearFramebuffer", OPTV_BOOLEAN, {0}, 0}, - {OPTION_VSYNC, "VSync", OPTV_BOOLEAN, {0}, 1}, - {OPTION_PAGEFLIP, "PageFlip", OPTV_BOOLEAN, {0}, 1}, + {OPTION_VSYNC, "VSync", OPTV_BOOLEAN, {0}, 1}, + {OPTION_PAGEFLIP, "PageFlip", OPTV_BOOLEAN, {0}, 1}, {OPTION_SWAPBUFFERS_WAIT, "SwapbuffersWait", OPTV_BOOLEAN, {0}, 1}, {OPTION_TRIPLE_BUFFER, "TripleBuffer", OPTV_BOOLEAN, {0}, 1}, {OPTION_PREFER_OVERLAY, "XvPreferOverlay", OPTV_BOOLEAN, {0}, 0}, {OPTION_HOTPLUG, "HotPlug", OPTV_BOOLEAN, {0}, 1}, {OPTION_REPROBE, "ReprobeOutputs", OPTV_BOOLEAN, {0}, 0}, #ifdef INTEL_XVMC - {OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, 1}, + {OPTION_XVMC, "XvMC", OPTV_BOOLEAN, {0}, 1}, #endif #ifdef USE_SNA {OPTION_ZAPHOD, "ZaphodHeads", OPTV_STRING, {0}, 0}, diff --git a/src/intel_options.h b/src/intel_options.h index e61075b3..77f0c45f 100644 --- a/src/intel_options.h +++ b/src/intel_options.h @@ -1,6 +1,7 @@ #ifndef INTEL_OPTIONS_H #define INTEL_OPTIONS_H +#include <xorg-server.h> #include <xf86.h> #include <xf86Opt.h> diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index bfb95a07..8c9d7fc1 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -60,7 +60,6 @@ #endif #include <xf86drm.h> #include <xf86DDC.h> /* for xf86InterpretEDID */ -#include <xf86Opt.h> /* for xf86OptionPtr */ #include "intel_options.h" diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index dcfcd673..4c956d81 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -59,7 +59,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include <micmap.h> #include <mipict.h> - #include <sys/ioctl.h> #include <sys/fcntl.h> #include "i915_drm.h" |