xf86-video-intel: 2 commits - src/intel_driver.c src/sna/sna_driver.c

[Chris Wilson]

 src/intel_driver.c   |    3 +--
 src/sna/sna_driver.c |   18 ++----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit c1785aaca2c9347114d28f114ee59ef8206d829b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jul 23 23:00:25 2012 +0100

    sna: Remove a surplus function
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 3f7234f..3bb2315 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -226,21 +226,6 @@ static void PreInitCleanup(ScrnInfoPtr scrn)
 	scrn->driverPrivate = NULL;
 }
 
-static void sna_check_chipset_option(ScrnInfoPtr scrn)
-{
-	struct sna *sna = to_sna(scrn);
-
-	sna->info = intel_detect_chipset(scrn, sna->pEnt, sna->PciInfo);
-}
-
-static Bool sna_get_early_options(ScrnInfoPtr scrn)
-{
-	struct sna *sna = to_sna(scrn);
-
-	sna->Options = intel_options_get(scrn);
-	return sna->Options != NULL;
-}
-
 struct sna_device {
 	int fd;
 	int open_count;
@@ -449,7 +434,8 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 	if (!xf86SetDefaultVisual(scrn, -1))
 		return FALSE;
 
-	if (!sna_get_early_options(scrn))
+	sna->Options = intel_options_get(scrn);
+	if (sna->Options == NULL)
 		return FALSE;
 
 	sna->info = intel_detect_chipset(scrn, sna->pEnt, sna->PciInfo);
commit 554fce8a65b2518cae032f1eadf58830559299c8
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Jul 23 22:59:16 2012 +0100

    uxa: Pass the correct parameters to intel_detect_chipset()
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_driver.c b/src/intel_driver.c
index e76f19e..cab7b4e 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -186,8 +186,7 @@ static void PreInitCleanup(ScrnInfoPtr scrn)
 static void intel_check_chipset_option(ScrnInfoPtr scrn)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
-	intel->info =
-		intel_detect_chipset(scrn, intel->pEnt->device, intel->PciInfo);
+	intel->info = intel_detect_chipset(scrn, intel->pEnt, intel->PciInfo);
 }
 
 static Bool I830GetEarlyOptions(ScrnInfoPtr scrn)