projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
db23417
)
st/xorg: Fix build failure against xserver with XF86_CRTC_VERSION < 3.
author
Michel Dänzer
<daenzer@vmware.com>
Mon, 24 Jan 2011 14:48:13 +0000
(15:48 +0100)
committer
Michel Dänzer
<daenzer@vmware.com>
Mon, 24 Jan 2011 14:48:13 +0000
(15:48 +0100)
Reported by Vinson Lee.
src/gallium/state_trackers/xorg/xorg_crtc.c
patch
|
blob
|
history
diff --git
a/src/gallium/state_trackers/xorg/xorg_crtc.c
b/src/gallium/state_trackers/xorg/xorg_crtc.c
index
71f7b8c
..
d751ac1
100644
(file)
--- a/
src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/
src/gallium/state_trackers/xorg/xorg_crtc.c
@@
-135,14
+135,12
@@
crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
/* Only set gamma when needed, to avoid unneeded delays. */
#if defined(XF86_CRTC_VERSION) && XF86_CRTC_VERSION >= 3
- if (!crtc->active)
-#endif
+ if (!crtc->active && crtc->version >= 3)
crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
crtc->gamma_blue, crtc->gamma_size);
-
-#if defined(XF86_CRTC_VERSION) && XF86_CRTC_VERSION >= 3
crtc->active = TRUE;
#endif
+
crtc->x = x;
crtc->y = y;
crtc->mode = *mode;