From 19be4fd74c24b0a05522c61b4658b0cffa144f59 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Tue, 21 Apr 2009 13:01:03 +0000
Subject: Tweak xorg.conf writing with intel driver

---
 lib/Xconfig/various.pm | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm
index 965af92..c5cae19 100644
--- a/lib/Xconfig/various.pm
+++ b/lib/Xconfig/various.pm
@@ -151,10 +151,22 @@ sub config {
     }
 
     if (exists $various->{EXA}) {
-	if ($various->{EXA}) {
-	    $card->{Options}{AccelMethod} = 'EXA';
-	} else {
-	    delete $card->{Options}{AccelMethod};
+	if ($card->{Driver} eq 'intel') {
+	    # the intel driver is able to automatically pick UXA/EXA
+	    #  when xorg.conf has no accel method defined, but XAA
+	    #  has to be explicitly selected, that's why the logic
+	    #  is reversed compared to the other drivers
+	    if ($various->{EXA}) {
+		delete $card->{Options}{AccelMethod};
+	    } else {
+		$card->{Options}{AccelMethod} = 'XAA';
+	    }
+        } else {
+	    if ($various->{EXA}) {
+		$card->{Options}{AccelMethod} = 'EXA';
+	    } else {
+		delete $card->{Options}{AccelMethod};
+	    }
 	}
     }
 
-- 
cgit v1.2.1