xsrc/43367: radeon/r300 dri module can't be loaded

[dieter.NetBSD%pandora.be@localhost]

>Number:         43367
>Category:       xsrc
>Synopsis:       radeon/r300 dri module can't be loaded
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed May 26 22:20:00 +0000 2010
>Originator:     dieter roelants
>Release:        NetBSD 5.99.29
>Organization:
>Environment:
System: NetBSD simult.amelgem.be 5.99.29 NetBSD 5.99.29 (SIMULT) #48: Tue May 
25 19:06:31 CEST 2010 
dieter%simult.amelgem.be@localhost:/build/obj.amd64.current/sys/arch/amd64/compile/SIMULT
 amd64
Architecture: x86_64
Machine: amd64
(II) Module radeon: vendor="X.Org Foundation"
        compiled for 1.6.5, module version = 6.13.0
>Description:
        After mrg's recent xorg/mesa updates (thanks!), the radeon
        r300 dri module fails to load like this:

(==) AIGLX enabled
(EE) AIGLX error: dlopen of /usr/X11R7/lib/modules/dri/r300_dri.so failed 
(/usr/X11R7/lib/modules/dri/r300_dri.so: Undefined symbol "rc_opcodes" (symnum 
= 227))
(EE) AIGLX: reverting to software rendering
(II) AIGLX: Loaded and initialized /usr/X11R7/lib/modules/dri/swrast_dri.so

        Note that I don't know if this worked before the update.
>How-To-Repeat:
        Start X on a kernel with radeondrm and a graphics card that
        requires above module. (Mine is a "ATI Radeon X550 (RV370)
        5B63 (PCIE)")
>Fix:
        I made it work by adding the SRCS from
        
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r300/compiler/Makefile
        to src/external/mit/xorg/lib/dri/r300/Makefile (see below),
        but I'm not sure this is the way it should be done.

Index: external/mit/xorg/lib/dri/r300/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/dri/r300/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- external/mit/xorg/lib/dri/r300/Makefile     23 May 2010 23:21:30 -0000      
1.5
+++ external/mit/xorg/lib/dri/r300/Makefile     26 May 2010 17:52:59 -0000
@@ -2,16 +2,19 @@
 
 MODULE=        r300
 
+CFLAGS += -std=c99
 CPPFLAGS+=     -DCOMPILE_R300 -DR200_MERGED=0 \
                -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R300 \
                -DRADEON_R300
 CPPFLAGS+=     -DHAVE_LIBDRM_RADEON
 
 CPPFLAGS+=     -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300 \
+               -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler \
                -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
                -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon/server
 
-DRI_EXTRA_PATHS=       ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon
+DRI_EXTRA_PATHS=       ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/radeon \
+                       ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/r300/compiler
 SRCS=  \
        radeon_bo_legacy.c \
        radeon_buffer_objects.c \
@@ -47,6 +50,31 @@
        radeon_bo.c \
        radeon_cs.c
 
+SRCS+= \
+               radeon_code.c \
+               radeon_compiler.c \
+               radeon_program.c \
+               radeon_program_print.c \
+               radeon_opcodes.c \
+               radeon_program_alu.c \
+               radeon_program_pair.c \
+               radeon_pair_translate.c \
+               radeon_pair_schedule.c \
+               radeon_pair_regalloc.c \
+               radeon_dataflow.c \
+               radeon_dataflow_deadcode.c \
+               radeon_dataflow_swizzles.c \
+               r3xx_fragprog.c \
+               r300_fragprog.c \
+               r300_fragprog_swizzle.c \
+               r300_fragprog_emit.c \
+               r500_fragprog.c \
+               r500_fragprog_emit.c \
+               r3xx_vertprog.c \
+               r3xx_vertprog_dump.c \
+               \
+               memory_pool.c
+
 LIBDPLIBS+=    drm_radeon      ${.CURDIR}/../../libdrm_radeon
 
 #      ../common/mm.c \