xf86-video-intel: Branch 'xf86-video-intel-2.6-branch' - 2 commits - src/i830_accel.c src/i830_driver.c
Zhenyu Wang
zhen at kemper.freedesktop.org
Wed Jan 14 21:12:43 PST 2009
src/i830_accel.c | 2 +-
src/i830_driver.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit ff67517db91a572a640e7a0ba247b8b71bfa2335
Author: Owain G. Ainsworth <oga at openbsd.org>
Date: Tue Jan 13 18:42:44 2009 +0000
Fix ioctl type.
I915_EMIT_IRQ is a read/write ioctl, not a write only. Found by OpenBSd's
kernel code which checks these things a long more strongly than Linux.
(cherry picked from commit 9f306193c4b128ec72c5b4db16d07302cee50ab5)
diff --git a/src/i830_accel.c b/src/i830_accel.c
index 7dff714..5ee53bb 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -205,7 +205,7 @@ I830Sync(ScrnInfoPtr pScrn)
* register reads for idle.
*/
emit.irq_seq = &wait.irq_seq;
- ret = drmCommandWrite(pI830->drmSubFD, DRM_I830_IRQ_EMIT, &emit,
+ ret = drmCommandWriteRead(pI830->drmSubFD, DRM_I830_IRQ_EMIT, &emit,
sizeof(emit));
if (ret != 0)
FatalError("Failure to emit IRQ: %s\n", strerror(-ret));
commit e84f21db824b2e9e7fe660927ecfbbf04b068f7a
Author: Owain G. Ainsworth <oga at openbsd.org>
Date: Tue Jan 13 17:02:59 2009 +0000
use ifdef __linux__ where needed.
since modesetting is compiled by default now, ifdef __linux__ the linux
only includes and ioctls.
(cherry picked from commit 1e8588ad5087c69eb77399cfaab8e4ec15eb4da9)
diff --git a/src/i830_driver.c b/src/i830_driver.c
index beb134d..4c40d40 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1131,7 +1131,9 @@ i830SetHotkeyControl(ScrnInfoPtr pScrn, int mode)
* DRM mode setting Linux only at this point... later on we could
* add a wrapper here.
*/
+#ifdef __linux__
#include <linux/kd.h>
+#endif
static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
{
@@ -1157,7 +1159,9 @@ static Bool i830_kernel_mode_enabled(ScrnInfoPtr pScrn)
if (ret)
return FALSE;
+#ifdef __linux__
ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);
+#endif
return TRUE;
}
More information about the xorg-commit
mailing list