16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 # DEALINGS IN THE SOFTWARE. |
20 # DEALINGS IN THE SOFTWARE. |
21 diff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c |
21 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c |
22 --- hw/xfree86/common/xf86Config.c 2010-09-03 16:45:16.628892543 -0700 |
22 index 7638e5c..d5e2097 100644 |
23 +++ hw/xfree86/common/xf86Config.c 2010-09-03 16:45:19.100446935 -0700 |
23 --- a/hw/xfree86/common/xf86Config.c |
24 @@ -538,11 +538,30 @@ fixup_video_driver_list(char **drivers) |
24 +++ b/hw/xfree86/common/xf86Config.c |
25 if (!strcmp(*drv, "ati")) { |
25 @@ -523,6 +523,25 @@ fixup_video_driver_list(char **drivers) |
26 ati = drv; |
|
27 x = *ati; *ati = *atimisc; *atimisc = x; |
|
28 - return; |
|
29 + break; |
|
30 } |
|
31 } |
26 } |
32 /* if we get here, ati was already ahead of atimisc */ |
27 } |
33 - return; |
28 } |
34 + break; |
|
35 + } |
|
36 + } |
|
37 + /* |
29 + /* |
38 + * Since the nvidia kernel driver interferes with the nv Xorg driver, |
30 + * Since the nvidia kernel driver interferes with the nv Xorg driver, |
39 + * make sure to prefer nvidia if it's installed |
31 + * make sure to prefer nvidia if it's installed |
40 + */ |
32 + */ |
41 + for (drv = drivers; drv != end; drv++) { |
33 + for (drv = drivers; drv != end; drv++) { |