xf86-video-intel: 2 commits - src/drmmode_display.c src/i830_dri.c src/i830_video.c

[Kristian Høgsberg]

 src/drmmode_display.c |    6 +++---
 src/i830_dri.c        |    4 +---
 src/i830_video.c      |    3 ---
 3 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 170f00e161931fdaa8c2812fc710649e1d6d977a
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Tue Feb 24 14:07:23 2009 -0500

    Remove a handful of unused variable warnings.

diff --git a/src/i830_dri.c b/src/i830_dri.c
index 105bb10..540bf5e 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1080,7 +1080,6 @@ I830DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
 {
    ScreenPtr pScreen = pParent->drawable.pScreen;
    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-   I830Ptr pI830 = I830PTR(pScrn);
    BoxPtr pboxTmp, pboxNext, pboxBase;
    DDXPointPtr pptTmp, pptNew2 = NULL;
    int xdir, ydir;
@@ -1253,7 +1252,6 @@ I830DRITransitionTo2d(ScreenPtr pScreen)
 {
    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
    I830Ptr pI830 = I830PTR(pScrn);
-   drmI830Sarea *sPriv = (drmI830Sarea *) DRIGetSAREAPrivate(pScreen);
 
    pI830->want_vblank_interrupts = FALSE;
    I830DRISetVBlankInterrupt(pScrn, FALSE);
@@ -1679,7 +1677,7 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
     I830Ptr pI830 = I830PTR(pScrn);
     DRI2InfoRec info;
     char *p, buf[64];
-    int fd, i, cmp;
+    int i;
     struct stat sbuf;
     dev_t d;
 
diff --git a/src/i830_video.c b/src/i830_video.c
index c9a0181..76b5189 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -2790,9 +2790,6 @@ I830StopSurface(XF86SurfacePtr surface)
 static int
 I830FreeSurface(XF86SurfacePtr surface)
 {
-    ScrnInfoPtr pScrn = surface->pScrn;
-    OffscreenPrivPtr pPriv = (OffscreenPrivPtr) surface->devPrivate.ptr;
-
     I830StopSurface(surface);
     xfree(surface->pitches);
     xfree(surface->offsets);
commit a6b31f38ebf470c61de0e10b0ce2af0d7ee1684b
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.

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) {