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

sna: Fix configuration user overrides on xorg-server < 1.14.99.1 

Marty Jack found that the enums for the user overrides were off by one
(his xorg conf was no longer being applied). This is because I had
missed the introduction of ZoomModes in 1.14.99 increasing all the
important enum values by one.

Reported-by: Marty Jack <marty19@comcast.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-07-03 21:45:11 +01:00
parent 1445a62da8
commit 5adca344b2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sna/sna_display.c
View File

@ -2928,10 +2928,16 @@ static bool sna_probe_initial_configuration(struct sna *sna)
{
ScrnInfoPtr scrn = sna->scrn;
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
const int user_overrides[] = {
const int user_overrides[] = { /* XXX fugly! */
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,1,0)
2, 3, 4, 5, 6, /* position */
11, /* rotate */
12, /* panning */
#else
1, 2, 3, 4, 5, /* position */
10, /* rotate */
11, /* panning */
#endif
};
int width, height;
int i, j;