[MPlayer-users] vidixlib: [radeon] Can't find chip

Thu Jan 20 18:09:53 CET 2005

Hi,
On Thu, Jan 20, 2005 at 05:53:04PM +0100, Daniele Boffi wrote:
> > This means it works with the old libdha compiled into new mplayer?
> 
> Yes.
> 
> > Do you have some old or multiple versions of libdha lying around 
> > in /usr/local/lib or /usr/lib?
> 
> Right now yes, but is shouldn't hurt (or help...).
> "test.c" is compiled against the libdha.so.0 in the current working

Since pre5 it should be libdha.so.1 - which is almost the only change
between pre4 and pre5.

> directory. In any case, when I tried first the pre5 version
> distributed with the gentoo ebuild it was the only one and it did
> not work.
> 
> > There shouldn't really be many changes between the 2 
> > libdha dirs. Try to find out what change broke it. (diff -u to see the 
> > differences).
> 
> This would probably take some time... nevertheless I can give it a 
> try.
> It would help me if you can give me some hints on which files I
> should look at first.

I did a diff between pre4 and pre5 (actually the release date of the
two), attached.
I really can't see anything that could cause problems.

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: libdha/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/Makefile,v
retrieving revision 1.22
retrieving revision 1.24
diff -u -r1.22 -r1.24

--- libdha/Makefile	26 Mar 2004 12:11:30 -0000	1.22
+++ libdha/Makefile	12 Jul 2004 10:54:10 -0000	1.24
@@ -2,8 +2,8 @@
 
 include ../config.mak
 
-MAJOR_VERSION = 0
-MINOR_VERSION = 1
+MAJOR_VERSION = 1
+MINOR_VERSION = 0
 VERSION = $(MAJOR_VERSION).$(MINOR_VERSION) 
 
 
@@ -60,7 +60,7 @@
 all:    $(LIBNAME) $(SHORTNAME)
 
 pci_names.c:
-	$(AWK) -f pci_db2c.awk oth/pci.db
+	LC_ALL=C $(AWK) -f pci_db2c.awk oth/pci.db
 
 test:
 	$(CC) test.c -o test $(SHORTNAME)
Index: libdha/pci.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/pci.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libdha/pci.c	2 Oct 2003 14:47:56 -0000	1.13
+++ libdha/pci.c	26 Jun 2004 12:40:56 -0000	1.14
@@ -492,6 +492,8 @@
 #include "sysdep/pci_arm32.c"
 #elif defined(__powerpc__)
 #include "sysdep/pci_powerpc.c"
+#elif defined(__x86_64__)
+/* Nothing here right now */
 #else
 #include "sysdep/pci_x86.c"
 #endif
Index: libdha/dhahelperwin/dhasetup.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/dhahelperwin/dhasetup.c,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -r1.3 -r1.6
--- libdha/dhahelperwin/dhasetup.c	1 Apr 2004 22:48:37 -0000	1.3
+++ libdha/dhahelperwin/dhasetup.c	9 May 2004 17:36:44 -0000	1.6
@@ -21,9 +21,10 @@
   hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
   if(!strcmp(argv[1],"install")){
     printf("Installing dhahelper...\n");
-    if(!CopyFile("dhahelper.sys",path,FALSE))
+    if(!CopyFile("dhahelper.sys",path,FALSE)){
       printf("Copying dhahelper.sys failed.\nEither dhahelper.sys is not in the current directory or you lack sufficient\nprivileges to write to %s.", path);
       return 1;
+    }
     // Install the driver
     hService = CreateService(hSCManager,
                              "DHAHELPER",
@@ -38,6 +39,9 @@
                              NULL,
                              NULL,
                              NULL);
+    if(!hService){
+      printf("Unable to register DHAHELPER Service (0x%x).\n",GetLastError());
+    }
   }
   else if(!strcmp(argv[1],"remove")){
     SERVICE_STATUS ServiceStatus;
Index: libdha/oth/pci.db
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/oth/pci.db,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -r1.9 -r1.12
--- libdha/oth/pci.db	26 Mar 2004 14:11:30 -0000	1.9
+++ libdha/oth/pci.db	12 May 2004 16:50:10 -0000	1.12
@@ -271,13 +271,23 @@
 d	10024e45	Radeon R300 NE [Radeon 9700]	0	
 d	10024e46	Radeon R300 NF [Radeon 9700]	0	
 d	10024e47	Radeon R300 NG [Radeon 9700]	0	
+d	10024145	Radeon R300 AE [Radeon 9700]	0
+d	10024146	Radeon R300 AF [Radeon 9700]	0
 d	10024e50	RV350 [Mobility Radeon 9600 M10]	0	New PCI ID provided by ATI developer relations	
 d	10024e52	RV350 [Mobility Radeon 9600 M10]	0	New PCI ID provided by ATI developer relations	
 d	10024e64	Radeon R300 [Radeon 9700] (Secondary)	0	
+d	10024148	Radeon R350 AH [Radeon 9800]	0
+d	10024149	Radeon R350 AI [Radeon 9800]	0
 d	10024150	Radeon RV350 AP [Radeon 9600 Pro]	0
 d	10024170	Radeon RV350 AP [Radeon 9600 Pro] (Secondary)	0
+d	10024152	Radeon RV350 AR [Radeon 9600XT]	0
+d	10024168	Radeon R350 [Radeon 9800] (Secondary)	0
 d	10024e48	Radeon R350 NH [Radeon 9800]	0
+d	10024e49	Radeon R350 [Radeon 9800]	0
+d	10024e4a	Radeon R360 NJ [Radeon 9800 XT]	0
 d	10024e68	Radeon R350 [Radeon 9800] (Secondary)	0
+d	10024e69	Radeon R350 [Radeon 9800] (Secondary)	0
+d	10024e6a	Radeon R360 NJ [Radeon 9800 XT] (Secondary)	0
 d	10025041	Rage 128 PA/PRO	0	
 d	10025042	Rage 128 PB/PRO AGP 2x	0	
 d	10025043	Rage 128 PC/PRO AGP 4x	0	
Index: libdha/sysdep/pci_linux.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/sysdep/pci_linux.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libdha/sysdep/pci_linux.c	28 Mar 2004 16:30:08 -0000	1.9
+++ libdha/sysdep/pci_linux.c	26 Jun 2004 12:40:56 -0000	1.10
@@ -7,7 +7,7 @@
 #ifdef __i386__
 // is this needed? #include <sys/perm.h>
 #else
-#if !defined(__sparc__) && !defined(__powerpc__)
+#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__x86_64__)
 #include <sys/io.h>
 #endif
 #endif
@@ -117,8 +117,8 @@
     return(0);
 }
 
-#if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)) \
-    && defined(__linux__) && !defined(CONFIG_SVGAHELPER)
+#if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) \
+    || defined(__x86_64__)) && defined(__linux__) && !defined(CONFIG_SVGAHELPER)
 #define CONFIG_PCI_LINUX_PROC
 #endif
 
