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

[Eric Anholt]

 src/i830_driver.c |    1 -
 src/i830_sdvo.c   |    8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d96f774d1bb39640486c72338fe8b19ee1ceaa23
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Dec 29 13:57:24 2008 -0800

    warning fix.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 16ddc41..c5d16a2 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2583,7 +2583,6 @@ void
 IntelEmitInvarientState(ScrnInfoPtr pScrn)
 {
    I830Ptr pI830 = I830PTR(pScrn);
-   uint32_t ctx_addr;
 
    if (pI830->accel == ACCEL_NONE)
       return;
commit 59b0fbb9be880d489374b141f818948a2721a2ef
Author: Henry unbongo <henryunbongo at yahoo.com>
Date:   Mon Dec 29 13:54:38 2008 -0800

    Add support for SDVO LVDS.

diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 6d2d8b1..0750166 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1904,6 +1904,14 @@ i830_sdvo_init(ScrnInfoPtr pScrn, int output_device)
 	dev_priv->controlled_output = SDVO_OUTPUT_RGB1;
         output->subpixel_order = SubPixelHorizontalRGB;
 	name_prefix="VGA";
+    } else if (dev_priv->caps.output_flags & SDVO_OUTPUT_LVDS0) {
+	dev_priv->controlled_output = SDVO_OUTPUT_LVDS0;
+        output->subpixel_order = SubPixelHorizontalRGB;
+	name_prefix="LVDS";
+    } else if (dev_priv->caps.output_flags & SDVO_OUTPUT_LVDS1) {
+	dev_priv->controlled_output = SDVO_OUTPUT_LVDS1;
+        output->subpixel_order = SubPixelHorizontalRGB;
+	name_prefix="LVDS";
     }
     else
     {