From 4a98273015f79ef84f73e8dff40b82cc4636d70f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 17 Oct 2007 02:56:51 +0000 Subject: use radeonhd as free driver for ATI X1300 and later, always use fglrx-hd2000 for HD 2xxx chips --- Makefile | 2 +- lst/Cards+ | 25 ++++++++----------------- lst/pcitable | 38 +++++++++++++++++++------------------- 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index 7d151109..61c6de7a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ include Makefile.config PACKAGE = ldetect-lst -VERSION := 0.1.199 +VERSION := 0.1.200 SVN_URL := $(shell svn info | grep ^URL: | cut -f2 -d\ ) SVN_BASE := $(shell svn info | sed -n '/^URL: \(.*\/$(PACKAGE)\).*/s//\1/p') diff --git a/lst/Cards+ b/lst/Cards+ index 6a4b949b..88ec86df 100644 --- a/lst/Cards+ +++ b/lst/Cards+ @@ -151,28 +151,19 @@ DRIVER ati DRI_GLX DRIVER2 fglrx -# Radeon cards supported by proprietary driver and free 'avivo' +# Radeon cards supported by proprietary driver and free 'radeonhd' # driver: update name as support changes -NAME ATI Radeon X1300 - X1950 (working with avivo driver) -DRIVER avivo -DRIVER2 fglrx - -# Radeon cards supported by proprietary driver but no free driver - -# fall back on vesa: update name as support changes NAME ATI Radeon X1300 - X1950 -DRIVER vesa +DRIVER radeonhd +DRI_GLX DRIVER2 fglrx -# Radeon cards supported by new proprietary driver but no free driver: -# update name as support changes -NAME ATI Radeon HD 2300 and later (working with proprietary driver) -DRIVER vesa -DRIVER2 fglrx-hd2000 - -# Radeon cards supported by neither proprietary driver nor free -# driver: update name as support changes +# Radeon cards supported by new proprietary driver and free +# 'radeonhd' driver: update name as support changes NAME ATI Radeon HD 2300 and later -DRIVER vesa +DRIVER radeonhd +DRI_GLX +DRIVER2 fglrx-hd2000 # ARK Logic diff --git a/lst/pcitable b/lst/pcitable index 03cc7ff4..b01f9956 100644 --- a/lst/pcitable +++ b/lst/pcitable @@ -325,7 +325,7 @@ 0x1002 0x710f "Card:ATI Radeon X1300 - X1950" 0x1002 0x7140 "Card:ATI Radeon X1300 - X1950" 0x1002 0x7141 "Card:ATI Radeon X1300 - X1950" -0x1002 0x7142 "Card:ATI Radeon X1300 - X1950 (working with avivo driver)" +0x1002 0x7142 "Card:ATI Radeon X1300 - X1950" 0x1002 0x7143 "Card:ATI Radeon X1300 - X1950" 0x1002 0x7145 "Card:ATI Radeon X1300 - X1950" 0x1002 0x7146 "Card:ATI Radeon X1300 - X1950" @@ -345,7 +345,7 @@ 0x1002 0x7180 "Card:ATI Radeon X1300 - X1950" 0x1002 0x7181 "Card:ATI Radeon X1300 - X1950" 0x1002 0x7183 "Card:ATI Radeon X1300 - X1950" -0x1002 0x7186 "Card:ATI Radeon X1300 - X1950 (working with avivo driver)" +0x1002 0x7186 "Card:ATI Radeon X1300 - X1950" 0x1002 0x7187 "Card:ATI Radeon X1300 - X1950" 0x1002 0x7188 "Card:ATI Radeon X1300 - X1950" 0x1002 0x718a "Card:ATI Radeon X1300 - X1950" @@ -361,7 +361,7 @@ 0x1002 0x71c1 "Card:ATI Radeon X1300 - X1950" 0x1002 0x71c2 "Card:ATI Radeon X1300 - X1950" 0x1002 0x71c3 "Card:ATI Radeon X1300 - X1950" -0x1002 0x71c4 "Card:ATI Radeon X1300 - X1950 (working with avivo driver)" +0x1002 0x71c4 "Card:ATI Radeon X1300 - X1950" 0x1002 0x71c5 "Card:ATI Radeon X1300 - X1950" 0x1002 0x71c6 "Card:ATI Radeon X1300 - X1950" 0x1002 0x71c7 "Card:ATI Radeon X1300 - X1950" @@ -374,7 +374,7 @@ 0x1002 0x71da "Card:ATI Radeon X1300 - X1950" 0x1002 0x71de "Card:ATI Radeon X1300 - X1950" 0x1002 0x71e7 "Card:ATI Radeon X1300 - X1950" -0x1002 0x7200 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" +0x1002 0x7200 "Card:ATI Radeon HD 2300 and later" 0x1002 0x7210 "Card:ATI Radeon HD 2300 and later" 0x1002 0x7211 "Card:ATI Radeon HD 2300 and later" 0x1002 0x7240 "Card:ATI Radeon X1300 - X1950" @@ -415,27 +415,27 @@ 0x1002 0x7942 "Card:ATI Radeon X1300 - X1950" 0x1002 0x796c "Card:ATI Radeon X1300 - X1950" 0x1002 0x7c37 "Card:ATI Radeon 9250 and earlier" -0x1002 0x9400 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x9401 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x9402 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x9403 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x94c0 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x94c1 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" +0x1002 0x9400 "Card:ATI Radeon HD 2300 and later" +0x1002 0x9401 "Card:ATI Radeon HD 2300 and later" +0x1002 0x9402 "Card:ATI Radeon HD 2300 and later" +0x1002 0x9403 "Card:ATI Radeon HD 2300 and later" +0x1002 0x94c0 "Card:ATI Radeon HD 2300 and later" +0x1002 0x94c1 "Card:ATI Radeon HD 2300 and later" 0x1002 0x94c3 "Card:ATI Radeon HD 2300 and later" -0x1002 0x94c4 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x94c6 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x94c7 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" +0x1002 0x94c4 "Card:ATI Radeon HD 2300 and later" +0x1002 0x94c6 "Card:ATI Radeon HD 2300 and later" +0x1002 0x94c7 "Card:ATI Radeon HD 2300 and later" 0x1002 0x94c8 "Card:ATI Radeon HD 2300 and later" 0x1002 0x94c9 "Card:ATI Radeon HD 2300 and later" 0x1002 0x94cb "Card:ATI Radeon HD 2300 and later" -0x1002 0x9580 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" +0x1002 0x9580 "Card:ATI Radeon HD 2300 and later" 0x1002 0x9581 "Card:ATI Radeon HD 2300 and later" 0x1002 0x9583 "Card:ATI Radeon HD 2300 and later" -0x1002 0x9586 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x9587 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x9588 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x9589 "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" -0x1002 0x958a "Card:ATI Radeon HD 2300 and later (working with proprietary driver)" +0x1002 0x9586 "Card:ATI Radeon HD 2300 and later" +0x1002 0x9587 "Card:ATI Radeon HD 2300 and later" +0x1002 0x9588 "Card:ATI Radeon HD 2300 and later" +0x1002 0x9589 "Card:ATI Radeon HD 2300 and later" +0x1002 0x958a "Card:ATI Radeon HD 2300 and later" 0x1005 0x2301 "Card:VGA driver (generic)" 0x1005 0x2302 "Card:VGA driver (generic)" 0x1005 0x2364 "Card:VGA driver (generic)" -- cgit v1.2.1