xf86-video-intel: src/intel_options.c src/intel_options.h src/sna/sna_display.c src/sna/sna_driver.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu Sep 19 03:31:41 PDT 2013
src/intel_options.c | 6 +++---
src/intel_options.h | 1 +
src/sna/sna_display.c | 1 -
src/sna/sna_driver.c | 1 -
4 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 6316905983fe1fb4828ff1039923327f467306fa
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Sep 19 11:28:30 2013 +0100
intel: Fix includes for intel_options
In commit dcf9b5ae1889926007cf8a0efd127e9df3c909de
Author: Chris Wilson <chris at 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 at gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69555
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel_options.c b/src/intel_options.c
index 6d53a3f..02a4ae1 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 e61075b..77f0c45 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 bfb95a0..8c9d7fc 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 dcfcd67..4c956d8 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"
More information about the xorg-commit
mailing list