Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: Fix includes for intel_options 

In commit dcf9b5ae18
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>
This commit is contained in:
Chris Wilson 2013-09-19 11:28:30 +01:00
parent afad7dd43d
commit 6316905983
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel_options.c
View File

@ -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},

1
src/intel_options.h
View File

@ -1,6 +1,7 @@
#ifndef INTEL_OPTIONS_H
#define INTEL_OPTIONS_H
#include <xorg-server.h>
#include <xf86.h>
#include <xf86Opt.h>

1
src/sna/sna_display.c
View File

@ -60,7 +60,6 @@
#endif
#include <xf86drm.h>
#include <xf86DDC.h> /* for xf86InterpretEDID */
#include <xf86Opt.h> /* for xf86OptionPtr */
#include "intel_options.h"

1
src/sna/sna_driver.c
View File

@ -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"