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

[Kristian Høgsberg]

 src/drmmode_display.c |    3 ++-
 src/i830_driver.c     |   10 +++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 70af658d4e94cc372f9e9c831611f70b3c1cecab
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Sat Dec 6 19:19:21 2008 -0500

    Simplify crtc preinit a bit.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 4031222..42ceb7c 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1475,9 +1475,6 @@ I830PreInitCrtcConfig(ScrnInfoPtr pScrn)
     I830Ptr pI830 = I830PTR(pScrn);
     int max_width, max_height;
 
-    if (pI830->use_drm_mode)
-	return;
-
     /* check quirks */
     i830_fixup_devices(pScrn);
 
@@ -1869,14 +1866,13 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		  "VBIOS initialization failed.\n");
 
-   I830PreInitCrtcConfig(pScrn);
-
    if (pI830->use_drm_mode) {
        if (!I830DrmModeInit(pScrn))
 	   return FALSE;
    } else {
-       if (!I830AccelMethodInit(pScrn))
-	   return FALSE;
+      I830PreInitCrtcConfig(pScrn);
+      if (!I830AccelMethodInit(pScrn))
+         return FALSE;
    }
 
    I830XvInit(pScrn);
commit 3ad9c9a82d7b359b9b711070628e6ff07a2aa9f7
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Sat Dec 6 19:17:39 2008 -0500

    Fix KMS compilation.

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 680071a..186ff2d 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -146,6 +146,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 	crtc->x = x;
 	crtc->y = y;
 	crtc->rotation = rotation;
+	crtc->transformPresent = FALSE;
 
 	output_ids = xcalloc(sizeof(uint32_t), xf86_config->num_output);
 	if (!output_ids) {
@@ -166,7 +167,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 		output_count++;
 	}
 
-	if (!xf86CrtcRotate(crtc, mode, rotation)) {
+	if (!xf86CrtcRotate(crtc)) {
 		goto done;
 	}