[Dri-devel] Re: DRM patch to convert radeon, r128 to userland firmware loading for Linux 2.6x

[Nathanael N. <ne...@tw...>]

Nathanael Nerode wrote:
> Nathanael Nerode wrote:
> 
>> Yeesh.  Attached are the patch and the new files.  I couldn't find a good
>> way to abstract this any further than I already did without breaking
>> other abstractions; hence the extra files.)
>>
>> Tell me what sort of changelog you'd like.
>>
>> This appears to work for Linux 2.6; I haven't been able to test it 
>> anywhere
>> else.  However, it should be quite close to no change at all 
>> everywhere else.
> 
> 
> Oh, and as I've said before, I can't *really* test it, because I don't 
> have the cards in question.  :-P  It builds and the module appears to 
> behave correctly as far as I can tell without hardware.

Of course, I just figured out that I had a very important chunk 
reversed.  (This didn't show up in my build because I was using the 
alternate Linux-2.6-specific version of this patch.) Replace the Kconfig 
diff with the following.

Testing for the whole mess is needed, of course.  Not to mention 
spotting any stupid errors I may have made.

Index: Makefile.kernel
===================================================================
RCS file: /cvs/dri/drm/linux/Makefile.kernel,v
retrieving revision 1.35
diff -u -r1.35 Makefile.kernel
--- Makefile.kernel     12 Apr 2004 05:27:36 -0000      1.35
+++ Makefile.kernel     21 Apr 2004 00:13:41 -0000
@@ -22,6 +22,16 @@

  # Kernel version checks

+# Userland firmware loading was introduced in version ???
+BELOW26 := $(shell if [ $(PATCHLEVEL) -lt 6 ]; then echo y; fi)
+ifeq ($(BELOW26), y)
+r128-objs   += r128_firmware.o
+radeon-objs += radeon_firmware.o
+else
+r128-objs   += r128_firmware_loader.o
+radeon-objs += radeon_firmware_loader.o
+endif
+
  BELOW25 := $(shell if [ $(PATCHLEVEL) -lt 5 ]; then echo y; fi)

  # There were major build changes starting with 2.5.52