Module Name: src
Committed By: riastradh
Date: Sat Jul 26 07:36:09 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: DRMKMS
src/sys/arch/i386/conf: DRMKMS
src/sys/external/bsd/drm2/radeon: files.radeon radeon_pci.c
Log Message:
Rename radeondrmkms to just plain radeon.
radeondrmkmsfb will stay as is until the name radeonfb is available
(currently taken by legacy dev/pci/radeonfb.c).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/conf/DRMKMS
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/conf/DRMKMS
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/radeon/files.radeon \
src/sys/external/bsd/drm2/radeon/radeon_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/DRMKMS
diff -u src/sys/arch/amd64/conf/DRMKMS:1.7 src/sys/arch/amd64/conf/DRMKMS:1.8
--- src/sys/arch/amd64/conf/DRMKMS:1.7 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/amd64/conf/DRMKMS Sat Jul 26 07:36:09 2014
@@ -3,7 +3,7 @@ include "arch/amd64/conf/NO_DRM"
i915drmkms* at pci? dev ? function ?
intelfb* at intelfbbus?
-radeondrmkms* at pci? dev ? function ?
+radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
#nouveau* at pci? dev ? function ?
Index: src/sys/arch/i386/conf/DRMKMS
diff -u src/sys/arch/i386/conf/DRMKMS:1.5 src/sys/arch/i386/conf/DRMKMS:1.6
--- src/sys/arch/i386/conf/DRMKMS:1.5 Fri Jul 25 15:01:14 2014
+++ src/sys/arch/i386/conf/DRMKMS Sat Jul 26 07:36:09 2014
@@ -3,7 +3,7 @@ include "arch/i386/conf/NO_DRM"
i915drmkms* at pci? dev ? function ?
intelfb* at intelfbbus?
-radeondrmkms* at pci? dev ? function ?
+radeon* at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?
#nouveau* at pci? dev ? function ?
Index: src/sys/external/bsd/drm2/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.3 src/sys/external/bsd/drm2/radeon/files.radeon:1.4
--- src/sys/external/bsd/drm2/radeon/files.radeon:1.3 Fri Jul 25 12:35:03 2014
+++ src/sys/external/bsd/drm2/radeon/files.radeon Sat Jul 26 07:36:09 2014
@@ -1,164 +1,164 @@
-# $NetBSD: files.radeon,v 1.3 2014/07/25 12:35:03 riastradh Exp $
+# $NetBSD: files.radeon,v 1.4 2014/07/26 07:36:09 riastradh Exp $
define radeonfbbus { }
-device radeondrmkms: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus
-attach radeondrmkms at pci
+device radeon: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus
+attach radeon at pci
# XXX Rename this to radeonfb when the legacy radeonfb(4) is gone.
device radeondrmkmsfb: radeonfbbus, genfb, wsemuldisplaydev
attach radeondrmkmsfb at radeonfbbus
-makeoptions radeondrmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/radeon"
-makeoptions radeondrmkms CPPFLAGS+="-I$S/external/bsd/drm2/include/radeon"
-makeoptions radeondrmkms CPPFLAGS+="-I$S/external/bsd/drm2/radeon"
-
-makeoptions radeondrmkms "CWARNFLAGS.atombios_encoders.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.atombios_i2c.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.btc_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.ci_dpm.c"+="-Wno-missing-field-initializers"
-makeoptions radeondrmkms "CWARNFLAGS.cik.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.cik_sdma.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.dce6_afmt.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.evergreen.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.evergreen_cs.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.kv_dpm.c"+="-Wno-missing-field-initializers"
-makeoptions radeondrmkms "CWARNFLAGS.kv_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.kv_dpm.c"+="-Wno-shadow"
-makeoptions radeondrmkms "CWARNFLAGS.kv_dpm.c"+="-Wno-type-limits"
-makeoptions radeondrmkms "CWARNFLAGS.ni.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.ni_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.r600.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.r600_cs.c"+="-Wno-missing-field-initializers"
-makeoptions radeondrmkms "CWARNFLAGS.r600_cs.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.r600_cs.c"+="-Wno-shadow"
-makeoptions radeondrmkms "CWARNFLAGS.r600_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_atombios.c"+="-Wno-missing-field-initializers"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_atombios.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_clocks.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_combios.c"+="-Wno-missing-field-initializers"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_combios.c"+="-Wno-prototypes-field-initializers"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_drv.c"+="-Wno-missing-field-initializers"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_gem.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_irq_kms.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_kms.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_legacy_crtc.c"+="-Wno-shadow"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_legacy_encoders.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_pm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_ttm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.radeon_vce.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.rs780_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.rv6xx_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.rv6xx_dpm.c"+="-Wno-shadow"
-makeoptions radeondrmkms "CWARNFLAGS.rv770.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.rv770_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.si.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.si_dpm.c"+="-Wno-missing-field-initializers"
-makeoptions radeondrmkms "CWARNFLAGS.si_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.sumo_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.trinity_dpm.c"+="-Wno-missing-prototypes"
-makeoptions radeondrmkms "CWARNFLAGS.vce_v2_0.c"+="-Wno-missing-prototypes"
-
-file external/bsd/drm2/dist/drm/radeon/atom.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/atombios_crtc.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/atombios_dp.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/atombios_encoders.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/atombios_i2c.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/btc_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/cayman_blit_shaders.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/ci_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/ci_smc.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/cik.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/cik_blit_shaders.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/cik_sdma.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/cypress_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/dce6_afmt.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/evergreen.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/evergreen_blit_shaders.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/evergreen_cs.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/evergreen_dma.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/evergreen_hdmi.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/kv_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/kv_smc.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/ni.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/ni_dma.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/ni_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r100.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r200.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r300.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r420.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r520.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r600.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r600_audio.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r600_blit_shaders.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r600_cs.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r600_dma.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r600_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/r600_hdmi.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_agp.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_asic.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_atombios.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_benchmark.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_bios.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_clocks.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_combios.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_connectors.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_cs.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_cursor.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_device.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_display.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_drv.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_encoders.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_fb.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_fence.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_gart.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_gem.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_i2c.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_irq_kms.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_kms.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_legacy_crtc.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_legacy_tv.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_object.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_pm.c radeondrmkms
-#file external/bsd/drm2/dist/drm/radeon/radeon_prime.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_ring.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_sa.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_semaphore.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_test.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_trace_points.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_ttm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_uvd.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_vce.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/radeon_vm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rs400.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rs600.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rs690.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rs780_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rv515.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rv6xx_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rv730_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rv740_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rv770.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rv770_dma.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rv770_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/rv770_smc.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/si.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/si_blit_shaders.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/si_dma.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/si_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/si_smc.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/sumo_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/sumo_smc.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/trinity_dpm.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/trinity_smc.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/uvd_v1_0.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/uvd_v2_2.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/uvd_v3_1.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/uvd_v4_2.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/vce_v1_0.c radeondrmkms
-file external/bsd/drm2/dist/drm/radeon/vce_v2_0.c radeondrmkms
+makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/radeon"
+makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/include/radeon"
+makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/radeon"
+
+makeoptions radeon "CWARNFLAGS.atombios_encoders.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.atombios_i2c.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.btc_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.ci_dpm.c"+="-Wno-missing-field-initializers"
+makeoptions radeon "CWARNFLAGS.cik.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.cik_sdma.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.dce6_afmt.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.evergreen.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.evergreen_cs.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.kv_dpm.c"+="-Wno-missing-field-initializers"
+makeoptions radeon "CWARNFLAGS.kv_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.kv_dpm.c"+="-Wno-shadow"
+makeoptions radeon "CWARNFLAGS.kv_dpm.c"+="-Wno-type-limits"
+makeoptions radeon "CWARNFLAGS.ni.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.ni_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.r600.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.r600_cs.c"+="-Wno-missing-field-initializers"
+makeoptions radeon "CWARNFLAGS.r600_cs.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.r600_cs.c"+="-Wno-shadow"
+makeoptions radeon "CWARNFLAGS.r600_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.radeon_atombios.c"+="-Wno-missing-field-initializers"
+makeoptions radeon "CWARNFLAGS.radeon_atombios.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.radeon_clocks.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.radeon_combios.c"+="-Wno-missing-field-initializers"
+makeoptions radeon "CWARNFLAGS.radeon_combios.c"+="-Wno-prototypes-field-initializers"
+makeoptions radeon "CWARNFLAGS.radeon_drv.c"+="-Wno-missing-field-initializers"
+makeoptions radeon "CWARNFLAGS.radeon_gem.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.radeon_irq_kms.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.radeon_kms.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.radeon_legacy_crtc.c"+="-Wno-shadow"
+makeoptions radeon "CWARNFLAGS.radeon_legacy_encoders.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.radeon_pm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.radeon_ttm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.radeon_vce.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.rs780_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.rv6xx_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.rv6xx_dpm.c"+="-Wno-shadow"
+makeoptions radeon "CWARNFLAGS.rv770.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.rv770_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.si.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.si_dpm.c"+="-Wno-missing-field-initializers"
+makeoptions radeon "CWARNFLAGS.si_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.sumo_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.trinity_dpm.c"+="-Wno-missing-prototypes"
+makeoptions radeon "CWARNFLAGS.vce_v2_0.c"+="-Wno-missing-prototypes"
+
+file external/bsd/drm2/dist/drm/radeon/atom.c radeon
+file external/bsd/drm2/dist/drm/radeon/atombios_crtc.c radeon
+file external/bsd/drm2/dist/drm/radeon/atombios_dp.c radeon
+file external/bsd/drm2/dist/drm/radeon/atombios_encoders.c radeon
+file external/bsd/drm2/dist/drm/radeon/atombios_i2c.c radeon
+file external/bsd/drm2/dist/drm/radeon/btc_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/cayman_blit_shaders.c radeon
+file external/bsd/drm2/dist/drm/radeon/ci_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/ci_smc.c radeon
+file external/bsd/drm2/dist/drm/radeon/cik.c radeon
+file external/bsd/drm2/dist/drm/radeon/cik_blit_shaders.c radeon
+file external/bsd/drm2/dist/drm/radeon/cik_sdma.c radeon
+file external/bsd/drm2/dist/drm/radeon/cypress_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/dce6_afmt.c radeon
+file external/bsd/drm2/dist/drm/radeon/evergreen.c radeon
+file external/bsd/drm2/dist/drm/radeon/evergreen_blit_shaders.c radeon
+file external/bsd/drm2/dist/drm/radeon/evergreen_cs.c radeon
+file external/bsd/drm2/dist/drm/radeon/evergreen_dma.c radeon
+file external/bsd/drm2/dist/drm/radeon/evergreen_hdmi.c radeon
+file external/bsd/drm2/dist/drm/radeon/kv_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/kv_smc.c radeon
+file external/bsd/drm2/dist/drm/radeon/ni.c radeon
+file external/bsd/drm2/dist/drm/radeon/ni_dma.c radeon
+file external/bsd/drm2/dist/drm/radeon/ni_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/r100.c radeon
+file external/bsd/drm2/dist/drm/radeon/r200.c radeon
+file external/bsd/drm2/dist/drm/radeon/r300.c radeon
+file external/bsd/drm2/dist/drm/radeon/r420.c radeon
+file external/bsd/drm2/dist/drm/radeon/r520.c radeon
+file external/bsd/drm2/dist/drm/radeon/r600.c radeon
+file external/bsd/drm2/dist/drm/radeon/r600_audio.c radeon
+file external/bsd/drm2/dist/drm/radeon/r600_blit_shaders.c radeon
+file external/bsd/drm2/dist/drm/radeon/r600_cs.c radeon
+file external/bsd/drm2/dist/drm/radeon/r600_dma.c radeon
+file external/bsd/drm2/dist/drm/radeon/r600_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/r600_hdmi.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_agp.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_asic.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_atombios.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_benchmark.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_bios.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_clocks.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_combios.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_connectors.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_cs.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_cursor.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_device.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_display.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_drv.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_encoders.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_fb.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_fence.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_gart.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_gem.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_i2c.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_irq_kms.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_kms.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_legacy_crtc.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_legacy_tv.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_object.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_pm.c radeon
+#file external/bsd/drm2/dist/drm/radeon/radeon_prime.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_ring.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_sa.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_semaphore.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_test.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_trace_points.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_ttm.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_uvd.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_vce.c radeon
+file external/bsd/drm2/dist/drm/radeon/radeon_vm.c radeon
+file external/bsd/drm2/dist/drm/radeon/rs400.c radeon
+file external/bsd/drm2/dist/drm/radeon/rs600.c radeon
+file external/bsd/drm2/dist/drm/radeon/rs690.c radeon
+file external/bsd/drm2/dist/drm/radeon/rs780_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/rv515.c radeon
+file external/bsd/drm2/dist/drm/radeon/rv6xx_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/rv730_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/rv740_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/rv770.c radeon
+file external/bsd/drm2/dist/drm/radeon/rv770_dma.c radeon
+file external/bsd/drm2/dist/drm/radeon/rv770_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/rv770_smc.c radeon
+file external/bsd/drm2/dist/drm/radeon/si.c radeon
+file external/bsd/drm2/dist/drm/radeon/si_blit_shaders.c radeon
+file external/bsd/drm2/dist/drm/radeon/si_dma.c radeon
+file external/bsd/drm2/dist/drm/radeon/si_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/si_smc.c radeon
+file external/bsd/drm2/dist/drm/radeon/sumo_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/sumo_smc.c radeon
+file external/bsd/drm2/dist/drm/radeon/trinity_dpm.c radeon
+file external/bsd/drm2/dist/drm/radeon/trinity_smc.c radeon
+file external/bsd/drm2/dist/drm/radeon/uvd_v1_0.c radeon
+file external/bsd/drm2/dist/drm/radeon/uvd_v2_2.c radeon
+file external/bsd/drm2/dist/drm/radeon/uvd_v3_1.c radeon
+file external/bsd/drm2/dist/drm/radeon/uvd_v4_2.c radeon
+file external/bsd/drm2/dist/drm/radeon/vce_v1_0.c radeon
+file external/bsd/drm2/dist/drm/radeon/vce_v2_0.c radeon
-file external/bsd/drm2/radeon/radeon_module.c radeondrmkms
-file external/bsd/drm2/radeon/radeon_pci.c radeondrmkms
+file external/bsd/drm2/radeon/radeon_module.c radeon
+file external/bsd/drm2/radeon/radeon_pci.c radeon
file external/bsd/drm2/radeon/radeondrmkmsfb.c radeondrmkmsfb
Index: src/sys/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.3 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.4
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.3 Sat Jul 26 07:32:18 2014
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Sat Jul 26 07:36:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.3 2014/07/26 07:32:18 riastradh Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.4 2014/07/26 07:36:09 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.3 2014/07/26 07:32:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.4 2014/07/26 07:36:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -102,7 +102,7 @@ static int radeon_detach(device_t, int);
static void radeon_task_work(struct work *, void *);
-CFATTACH_DECL_NEW(radeondrmkms, sizeof(struct radeon_softc),
+CFATTACH_DECL_NEW(radeon, sizeof(struct radeon_softc),
radeon_match, radeon_attach, radeon_detach, NULL);
/* XXX Kludge to get these from radeon_drv.c. */
