xf86-video-intel: Branch '2.6' - 3 commits - configure.ac src/drmmode_display.c src/Makefile.am

[Eric Anholt]

 configure.ac          |    2 +-
 src/Makefile.am       |    3 +--
 src/drmmode_display.c |    6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 93ae6c7f8cadb60d479e626ddd2a67d7cb2cc4c0
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Feb 24 13:59:17 2009 -0800

    Bump version to 2.6.2 for release.

diff --git a/configure.ac b/configure.ac
index 4d40427..13d7468 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-intel],
-        2.6.1,
+        2.6.2,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-intel)
 
commit 626a54870fd3c5038c7bdae5d9085fe98f73885b
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Feb 24 14:05:15 2009 -0800

    Fix distcheck from drmmode_display.h deletion.
    (cherry picked from commit 9d8e5c21a1688b915bf39261d4c3b0bf2906daef)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3fb30ff..cbe9fb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,8 +136,7 @@ intel_drv_la_SOURCES = \
 	 i830_render.c \
 	 i915_render.c \
 	 i965_render.c \
-	 drmmode_display.c \
-	 drmmode_display.h
+	 drmmode_display.c
 
 INTEL_G4A =				\
 	packed_yuv_sf.g4a		\
commit aa6997ecd5383ee94c8ac9cfca4a1b58820e098c
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Tue Feb 24 13:58:20 2009 -0500

    Update kms to work with drmModeModeInfo API update.
    (cherry picked from commit a6b31f38ebf470c61de0e10b0ce2af0d7ee1684b)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index f0e4f1e..8128004 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -61,7 +61,7 @@ typedef struct {
 
 static void
 drmmode_ConvertFromKMode(ScrnInfoPtr scrn,
-			 struct drm_mode_modeinfo *kmode,
+			 drmModeModeInfoPtr kmode,
 			 DisplayModePtr	mode)
 {
 	memset(mode, 0, sizeof(DisplayModeRec));
@@ -93,7 +93,7 @@ drmmode_ConvertFromKMode(ScrnInfoPtr scrn,
 
 static void
 drmmode_ConvertToKMode(ScrnInfoPtr scrn,
-		       struct drm_mode_modeinfo *kmode,
+		       drmModeModeInfoPtr kmode,
 		       DisplayModePtr mode)
 {
 	memset(kmode, 0, sizeof(*kmode));
@@ -141,7 +141,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 	int ret = TRUE;
 	int i;
 	int fb_id;
-	struct drm_mode_modeinfo kmode;
+	drmModeModeInfo kmode;
 	unsigned int pitch = pScrn->displayWidth * pI830->cpp;
 
 	if (drmmode->fb_id == 0) {