kernel/drm: Make i915 and radeon compilable into the kernel.
authorSascha Wildner <saw@online.de>
Sun, 29 Nov 2015 15:59:52 +0000 (16:59 +0100)
committerSascha Wildner <saw@online.de>
Sun, 29 Nov 2015 16:48:48 +0000 (17:48 +0100)
This is for debugging and testing purposes.

For example, it helps catching certain types of errors which are
not easily caught when building just the module, such as when a
prototype of a called function is present but its implementation
isn't.

share/man/man4/drm.4
sys/conf/files
sys/config/LINT64

index 34e9714..b324548 100644 (file)
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 12, 2015
+.Dd November 29, 2015
 .Dt DRM 4
 .Os
 .Sh NAME
@@ -41,10 +41,10 @@ for supporting video acceleration.
 The
 .Nm
 drivers provide support for the following chipsets:
-.Bl -column -offset indent ".Sy ModuleXXX" ".Sy Kernel option" ".Sy Chipset"
+.Bl -column -offset indent ".Pa radeonkms.ko" ".Sy Kernel Option" ".Sy Chipset"
 .It Sy Module Ta Sy "Kernel option" Ta Sy Chipset
-.It Pa i915.ko Ta n/a Ta Intel i915, i945, i965, G3x, G4x
-.It Pa radeonkms.ko Ta n/a Ta AMD Radeon
+.It Pa i915.ko Ta i915 Ta Intel i915, i945, i965, G3x, G4x
+.It Pa radeonkms.ko Ta radeon Ta AMD Radeon
 .El
 .Pp
 In most cases
index 1382fe5..fe35058 100644 (file)
@@ -2025,149 +2025,158 @@ dev/drm/ttm/ttm_execbuf_util.c                optional drm
 dev/drm/ttm/ttm_memory.c               optional drm
 dev/drm/ttm/ttm_page_alloc.c           optional drm
 dev/drm/ttm/ttm_bo_vm.c                        optional drm
-# i915kms breaks VGA console, disabled by default
-#dev/drm/i915/i915_dma.c                       optional i915kms drm
-#dev/drm/i915/i915_drv.c                       optional i915kms drm
-#dev/drm/i915/i915_gem.c                       optional i915kms drm
-#dev/drm/i915/i915_gem_context.c               optional i915kms drm
-#dev/drm/i915/i915_gem_execbuffer.c    optional i915kms drm
-#dev/drm/i915/i915_gem_evict.c         optional i915kms drm
-#dev/drm/i915/i915_gem_gtt.c           optional i915kms drm
-#dev/drm/i915/i915_gem_stolen.c                optional i915kms drm
-#dev/drm/i915/i915_gem_tiling.c                optional i915kms drm
-#dev/drm/i915/i915_irq.c                       optional i915kms drm
-#dev/drm/i915/i915_suspend.c           optional i915kms drm
-#dev/drm/i915/i915_ums.c                       optional i915kms drm
-#dev/drm/i915/intel_acpi.c             optional i915kms drm
-#dev/drm/i915/intel_bios.c             optional i915kms drm
-#dev/drm/i915/intel_crt.c              optional i915kms drm
-#dev/drm/i915/intel_ddi.c              optional i915kms drm
-#dev/drm/i915/intel_display.c          optional i915kms drm
-#dev/drm/i915/intel_dp.c                       optional i915kms drm
-#dev/drm/i915/intel_dsi.c              optional i915kms drm
-#dev/drm/i915/intel_dsi_cmd.c          optional i915kms drm
-#dev/drm/i915/intel_dsi_pll.c          optional i915kms drm
-#dev/drm/i915/intel_fbdev.c            optional i915kms drm
-#dev/drm/i915/intel_hdmi.c             optional i915kms drm
-#dev/drm/i915/intel_i2c.c              optional i915kms drm
-#dev/drm/i915/intel_lvds.c             optional i915kms drm
-#dev/drm/i915/intel_modes.c            optional i915kms drm
-#dev/drm/i915/intel_opregion.c         optional i915kms drm
-#dev/drm/i915/intel_overlay.c          optional i915kms drm
-#dev/drm/i915/intel_panel.c            optional i915kms drm
-#dev/drm/i915/intel_pm.c                       optional i915kms drm
-#dev/drm/i915/intel_ringbuffer.c               optional i915kms drm
-#dev/drm/i915/intel_sdvo.c             optional i915kms drm
-#dev/drm/i915/intel_sideband.c         optional i915kms drm
-#dev/drm/i915/intel_sprite.c           optional i915kms drm
-#dev/drm/i915/intel_tv.c                       optional i915kms drm
-#dev/drm/i915/intel_uncore.c           optional i915kms drm
-#dev/drm/radeon/atom.c                 optional radeonkms drm
-#dev/drm/radeon/atombios_crtc.c                optional radeonkms drm
-#dev/drm/radeon/atombios_dp.c          optional radeonkms drm
-#dev/drm/radeon/atombios_encoders.c    optional radeonkms drm
-#dev/drm/radeon/atombios_i2c.c         optional radeonkms drm
-#dev/drm/radeon/btc_dpm.c              optional radeonkms drm
-#dev/drm/radeon/cayman_blit_shaders.c  optional radeonkms drm
-#dev/drm/radeon/ci_dpm.c                       optional radeonkms drm
-#dev/drm/radeon/ci_smc.c                       optional radeonkms drm
-#dev/drm/radeon/cik.c                  optional radeonkms drm
-#dev/drm/radeon/cik_blit_shaders.c     optional radeonkms drm
-#dev/drm/radeon/cik_dma.c              optional radeonkms drm
-#dev/drm/radeon/cypress_dpm.c          optional radeonkms drm
-#dev/drm/radeon/dce3_1_afmt.c          optional radeonkms drm
-#dev/drm/radeon/dce6_afmt.c            optional radeonkms drm
-#dev/drm/radeon/evergreen.c            optional radeonkms drm
-#dev/drm/radeon/evergreen_blit_shaders.c       optional radeonkms drm
-#dev/drm/radeon/evergreen_cs.c         optional radeonkms drm
-#dev/drm/radeon/evergreen_dma.c                optional radeonkms drm
-#dev/drm/radeon/evergreen_hdmi.c       optional radeonkms drm
-#dev/drm/radeon/kv_dpm.c                       optional radeonkms drm
-#dev/drm/radeon/kv_smc.c                       optional radeonkms drm
-#dev/drm/radeon/ni.c                   optional radeonkms drm
-#dev/drm/radeon/ni_dma.c                       optional radeonkms drm
-#dev/drm/radeon/ni_dpm.c                       optional radeonkms drm
-#dev/drm/radeon/r100.c                 optional radeonkms drm
-#dev/drm/radeon/r200.c                 optional radeonkms drm
-#dev/drm/radeon/r300.c                 optional radeonkms drm
-##dev/drm/radeon/r300_cmdbuf.c         optional radeonkms drm
-#dev/drm/radeon/r420.c                 optional radeonkms drm
-#dev/drm/radeon/r520.c                 optional radeonkms drm
-#dev/drm/radeon/r600.c                 optional radeonkms drm
-##dev/drm/radeon/r600_blit.c           optional radeonkms drm
-#dev/drm/radeon/r600_blit_shaders.c    optional radeonkms drm
-##dev/drm/radeon/r600_cp.c             optional radeonkms drm
-#dev/drm/radeon/r600_cs.c              optional radeonkms drm
-#dev/drm/radeon/r600_dma.c             optional radeonkms drm
-#dev/drm/radeon/r600_dpm.c             optional radeonkms drm
-#dev/drm/radeon/r600_hdmi.c            optional radeonkms drm
-#dev/drm/radeon/radeon_acpi.c          optional radeonkms drm
-#dev/drm/radeon/radeon_agp.c           optional radeonkms drm
-#dev/drm/radeon/radeon_asic.c          optional radeonkms drm
-#dev/drm/radeon/radeon_atombios.c      optional radeonkms drm
-#dev/drm/radeon/radeon_benchmark.c     optional radeonkms drm
-#dev/drm/radeon/radeon_bios.c          optional radeonkms drm
-#dev/drm/radeon/radeon_clocks.c                optional radeonkms drm
-#dev/drm/radeon/radeon_combios.c       optional radeonkms drm
-#dev/drm/radeon/radeon_connectors.c    optional radeonkms drm
-##dev/drm/radeon/radeon_cp.c           optional radeonkms drm
-#dev/drm/radeon/radeon_cs.c            optional radeonkms drm
-#dev/drm/radeon/radeon_cursor.c                optional radeonkms drm
-#dev/drm/radeon/radeon_device.c                optional radeonkms drm
-#dev/drm/radeon/radeon_display.c       optional radeonkms drm
-#dev/drm/radeon/radeon_drv.c           optional radeonkms drm
-#dev/drm/radeon/radeon_encoders.c      optional radeonkms drm
-#dev/drm/radeon/radeon_fb.c            optional radeonkms drm
-#dev/drm/radeon/radeon_fence.c         optional radeonkms drm
-#dev/drm/radeon/radeon_gart.c          optional radeonkms drm
-#dev/drm/radeon/radeon_gem.c           optional radeonkms drm
-#dev/drm/radeon/radeon_i2c.c           optional radeonkms drm
-#dev/drm/radeon/radeon_ib.c            optional radeonkms drm
-##dev/drm/radeon/radeon_irq.c          optional radeonkms drm
-#dev/drm/radeon/radeon_irq_kms.c       optional radeonkms drm
-#dev/drm/radeon/radeon_kms.c           optional radeonkms drm
-#dev/drm/radeon/radeon_legacy_crtc.c   optional radeonkms drm
-#dev/drm/radeon/radeon_legacy_encoders.c       optional radeonkms drm
-#dev/drm/radeon/radeon_legacy_tv.c     optional radeonkms drm
-##dev/drm/radeon/radeon_mem.c          optional radeonkms drm
-#dev/drm/radeon/radeon_object.c                optional radeonkms drm
-#dev/drm/radeon/radeon_pm.c            optional radeonkms drm
-#dev/drm/radeon/radeon_ring.c          optional radeonkms drm
-#dev/drm/radeon/radeon_sa.c            optional radeonkms drm
-#dev/drm/radeon/radeon_semaphore.c     optional radeonkms drm
-##dev/drm/radeon/radeon_state.c                optional radeonkms drm
-#dev/drm/radeon/radeon_test.c          optional radeonkms drm
-#dev/drm/radeon/radeon_ttm.c           optional radeonkms drm
-#dev/drm/radeon/radeon_uvd.c           optional radeonkms drm
-#dev/drm/radeon/radeon_vce.c           optional radeonkms drm
-#dev/drm/radeon/radeon_vm.c            optional radeonkms drm
-#dev/drm/radeon/rs400.c                        optional radeonkms drm
-#dev/drm/radeon/rs600.c                        optional radeonkms drm
-#dev/drm/radeon/rs690.c                        optional radeonkms drm
-#dev/drm/radeon/rs780_dpm.c            optional radeonkms drm
-#dev/drm/radeon/rv515.c                        optional radeonkms drm
-#dev/drm/radeon/rv6xx_dpm.c            optional radeonkms drm
-#dev/drm/radeon/rv730_dpm.c            optional radeonkms drm
-#dev/drm/radeon/rv740_dpm.c            optional radeonkms drm
-#dev/drm/radeon/rv770.c                        optional radeonkms drm
-#dev/drm/radeon/rv770_dpm.c            optional radeonkms drm
-#dev/drm/radeon/rv770_dma.c            optional radeonkms drm
-#dev/drm/radeon/rv770_smc.c            optional radeonkms drm
-#dev/drm/radeon/si.c                   optional radeonkms drm
-#dev/drm/radeon/si_blit_shaders.c      optional radeonkms drm
-#dev/drm/radeon/si_dpm.c                       optional radeonkms drm
-#dev/drm/radeon/si_dma.c                       optional radeonkms drm
-#dev/drm/radeon/si_smc.c                       optional radeonkms drm
-#dev/drm/radeon/sumo_dpm.c             optional radeonkms drm
-#dev/drm/radeon/sumo_smc.c             optional radeonkms drm
-#dev/drm/radeon/trinity_dpm.c          optional radeonkms drm
-#dev/drm/radeon/trinity_smc.c          optional radeonkms drm
-#dev/drm/radeon/uvd_v1_0.c             optional radeonkms drm
-#dev/drm/radeon/uvd_v2_2.c             optional radeonkms drm
-#dev/drm/radeon/uvd_v3_1.c             optional radeonkms drm
-#dev/drm/radeon/uvd_v4_2.c             optional radeonkms drm
-#dev/drm/radeon/vce_v1_0.c             optional radeonkms drm
-#dev/drm/radeon/vce_v2_0.c             optional radeonkms drm
+dev/drm/i915/dvo_ch7017.c              optional i915 drm
+dev/drm/i915/dvo_ch7xxx.c              optional i915 drm
+dev/drm/i915/dvo_ivch.c                        optional i915 drm
+dev/drm/i915/dvo_ns2501.c              optional i915 drm
+dev/drm/i915/dvo_sil164.c              optional i915 drm
+dev/drm/i915/dvo_tfp410.c              optional i915 drm
+dev/drm/i915/i915_cmd_parser.c         optional i915 drm
+dev/drm/i915/i915_dma.c                        optional i915 drm
+dev/drm/i915/i915_drv.c                        optional i915 drm
+dev/drm/i915/i915_gem.c                        optional i915 drm
+dev/drm/i915/i915_gem_context.c                optional i915 drm
+dev/drm/i915/i915_gem_execbuffer.c     optional i915 drm
+dev/drm/i915/i915_gem_evict.c          optional i915 drm
+dev/drm/i915/i915_gem_gtt.c            optional i915 drm
+dev/drm/i915/i915_gem_stolen.c         optional i915 drm
+dev/drm/i915/i915_gem_render_state.c   optional i915 drm
+dev/drm/i915/i915_gem_tiling.c         optional i915 drm
+dev/drm/i915/i915_gem_userptr.c                optional i915 drm
+dev/drm/i915/i915_irq.c                        optional i915 drm
+dev/drm/i915/i915_params.c             optional i915 drm
+dev/drm/i915/i915_suspend.c            optional i915 drm
+dev/drm/i915/i915_ums.c                        optional i915 drm
+dev/drm/i915/intel_acpi.c              optional i915 drm
+dev/drm/i915/intel_bios.c              optional i915 drm
+dev/drm/i915/intel_crt.c               optional i915 drm
+dev/drm/i915/intel_ddi.c               optional i915 drm
+dev/drm/i915/intel_display.c           optional i915 drm
+dev/drm/i915/intel_dp.c                        optional i915 drm
+dev/drm/i915/intel_dp_mst.c            optional i915 drm
+dev/drm/i915/intel_dsi.c               optional i915 drm
+dev/drm/i915/intel_dsi_cmd.c           optional i915 drm
+dev/drm/i915/intel_dsi_panel_vbt.c     optional i915 drm
+dev/drm/i915/intel_dsi_pll.c           optional i915 drm
+dev/drm/i915/intel_dvo.c               optional i915 drm
+dev/drm/i915/intel_fbdev.c             optional i915 drm
+dev/drm/i915/intel_hdmi.c              optional i915 drm
+dev/drm/i915/intel_i2c.c               optional i915 drm
+dev/drm/i915/intel_lrc.c               optional i915 drm
+dev/drm/i915/intel_lvds.c              optional i915 drm
+dev/drm/i915/intel_modes.c             optional i915 drm
+dev/drm/i915/intel_opregion.c          optional i915 drm
+dev/drm/i915/intel_overlay.c           optional i915 drm
+dev/drm/i915/intel_panel.c             optional i915 drm
+dev/drm/i915/intel_pm.c                        optional i915 drm
+dev/drm/i915/intel_renderstate_gen6.c  optional i915 drm
+dev/drm/i915/intel_renderstate_gen7.c  optional i915 drm
+dev/drm/i915/intel_renderstate_gen8.c  optional i915 drm
+dev/drm/i915/intel_ringbuffer.c                optional i915 drm
+dev/drm/i915/intel_sdvo.c              optional i915 drm
+dev/drm/i915/intel_sideband.c          optional i915 drm
+dev/drm/i915/intel_sprite.c            optional i915 drm
+dev/drm/i915/intel_tv.c                        optional i915 drm
+dev/drm/i915/intel_uncore.c            optional i915 drm
+dev/drm/radeon/atom.c                  optional radeon drm
+dev/drm/radeon/atombios_crtc.c         optional radeon drm
+dev/drm/radeon/atombios_dp.c           optional radeon drm
+dev/drm/radeon/atombios_encoders.c     optional radeon drm
+dev/drm/radeon/atombios_i2c.c          optional radeon drm
+dev/drm/radeon/btc_dpm.c               optional radeon drm
+dev/drm/radeon/cayman_blit_shaders.c   optional radeon drm
+dev/drm/radeon/ci_dpm.c                        optional radeon drm
+dev/drm/radeon/ci_smc.c                        optional radeon drm
+dev/drm/radeon/cik.c                   optional radeon drm
+dev/drm/radeon/cik_blit_shaders.c      optional radeon drm
+dev/drm/radeon/cik_sdma.c              optional radeon drm
+dev/drm/radeon/cypress_dpm.c           optional radeon drm
+dev/drm/radeon/dce3_1_afmt.c           optional radeon drm
+dev/drm/radeon/dce6_afmt.c             optional radeon drm
+dev/drm/radeon/evergreen.c             optional radeon drm
+dev/drm/radeon/evergreen_blit_shaders.c        optional radeon drm
+dev/drm/radeon/evergreen_cs.c          optional radeon drm
+dev/drm/radeon/evergreen_dma.c         optional radeon drm
+dev/drm/radeon/evergreen_hdmi.c                optional radeon drm
+dev/drm/radeon/kv_dpm.c                        optional radeon drm
+dev/drm/radeon/kv_smc.c                        optional radeon drm
+dev/drm/radeon/ni.c                    optional radeon drm
+dev/drm/radeon/ni_dma.c                        optional radeon drm
+dev/drm/radeon/ni_dpm.c                        optional radeon drm
+dev/drm/radeon/r100.c                  optional radeon drm
+dev/drm/radeon/r200.c                  optional radeon drm
+dev/drm/radeon/r300.c                  optional radeon drm
+dev/drm/radeon/r420.c                  optional radeon drm
+dev/drm/radeon/r520.c                  optional radeon drm
+dev/drm/radeon/r600.c                  optional radeon drm
+dev/drm/radeon/r600_blit_shaders.c     optional radeon drm
+dev/drm/radeon/r600_cs.c               optional radeon drm
+dev/drm/radeon/r600_dma.c              optional radeon drm
+dev/drm/radeon/r600_dpm.c              optional radeon drm
+dev/drm/radeon/r600_hdmi.c             optional radeon drm
+dev/drm/radeon/radeon_acpi.c           optional radeon drm
+dev/drm/radeon/radeon_agp.c            optional radeon drm
+dev/drm/radeon/radeon_asic.c           optional radeon drm
+dev/drm/radeon/radeon_atombios.c       optional radeon drm
+dev/drm/radeon/radeon_benchmark.c      optional radeon drm
+dev/drm/radeon/radeon_bios.c           optional radeon drm
+dev/drm/radeon/radeon_clocks.c         optional radeon drm
+dev/drm/radeon/radeon_combios.c                optional radeon drm
+dev/drm/radeon/radeon_connectors.c     optional radeon drm
+dev/drm/radeon/radeon_cs.c             optional radeon drm
+dev/drm/radeon/radeon_cursor.c         optional radeon drm
+dev/drm/radeon/radeon_device.c         optional radeon drm
+dev/drm/radeon/radeon_display.c                optional radeon drm
+dev/drm/radeon/radeon_drv.c            optional radeon drm
+dev/drm/radeon/radeon_encoders.c       optional radeon drm
+dev/drm/radeon/radeon_fb.c             optional radeon drm
+dev/drm/radeon/radeon_fence.c          optional radeon drm
+dev/drm/radeon/radeon_gart.c           optional radeon drm
+dev/drm/radeon/radeon_gem.c            optional radeon drm
+dev/drm/radeon/radeon_i2c.c            optional radeon drm
+dev/drm/radeon/radeon_ib.c             optional radeon drm
+dev/drm/radeon/radeon_irq_kms.c                optional radeon drm
+dev/drm/radeon/radeon_kms.c            optional radeon drm
+dev/drm/radeon/radeon_legacy_crtc.c    optional radeon drm
+dev/drm/radeon/radeon_legacy_encoders.c        optional radeon drm
+dev/drm/radeon/radeon_legacy_tv.c      optional radeon drm
+dev/drm/radeon/radeon_object.c         optional radeon drm
+dev/drm/radeon/radeon_pm.c             optional radeon drm
+dev/drm/radeon/radeon_ring.c           optional radeon drm
+dev/drm/radeon/radeon_sa.c             optional radeon drm
+dev/drm/radeon/radeon_semaphore.c      optional radeon drm
+dev/drm/radeon/radeon_test.c           optional radeon drm
+dev/drm/radeon/radeon_ttm.c            optional radeon drm
+dev/drm/radeon/radeon_uvd.c            optional radeon drm
+dev/drm/radeon/radeon_vce.c            optional radeon drm
+dev/drm/radeon/radeon_vm.c             optional radeon drm
+dev/drm/radeon/rs400.c                 optional radeon drm
+dev/drm/radeon/rs600.c                 optional radeon drm
+dev/drm/radeon/rs690.c                 optional radeon drm
+dev/drm/radeon/rs780_dpm.c             optional radeon drm
+dev/drm/radeon/rv515.c                 optional radeon drm
+dev/drm/radeon/rv6xx_dpm.c             optional radeon drm
+dev/drm/radeon/rv730_dpm.c             optional radeon drm
+dev/drm/radeon/rv740_dpm.c             optional radeon drm
+dev/drm/radeon/rv770.c                 optional radeon drm
+dev/drm/radeon/rv770_dpm.c             optional radeon drm
+dev/drm/radeon/rv770_dma.c             optional radeon drm
+dev/drm/radeon/rv770_smc.c             optional radeon drm
+dev/drm/radeon/si.c                    optional radeon drm
+dev/drm/radeon/si_blit_shaders.c       optional radeon drm
+dev/drm/radeon/si_dpm.c                        optional radeon drm
+dev/drm/radeon/si_dma.c                        optional radeon drm
+dev/drm/radeon/si_smc.c                        optional radeon drm
+dev/drm/radeon/sumo_dpm.c              optional radeon drm
+dev/drm/radeon/sumo_smc.c              optional radeon drm
+dev/drm/radeon/trinity_dpm.c           optional radeon drm
+dev/drm/radeon/trinity_smc.c           optional radeon drm
+dev/drm/radeon/uvd_v1_0.c              optional radeon drm
+dev/drm/radeon/uvd_v2_2.c              optional radeon drm
+dev/drm/radeon/uvd_v3_1.c              optional radeon drm
+dev/drm/radeon/uvd_v4_2.c              optional radeon drm
+dev/drm/radeon/vce_v1_0.c              optional radeon drm
+dev/drm/radeon/vce_v2_0.c              optional radeon drm
 dev/misc/nsclpcsio/nsclpcsio_isa.c     optional nsclpcsio isa
 dev/powermng/aps/aps.c                 optional aps isa
 dev/powermng/it/it.c                   optional it isa
index f123e8c..19bc549 100644 (file)
@@ -2180,16 +2180,18 @@ device          aibs            # ASUSTeK AI Booster (ACPI ASOC ATK0110)
 
 # DRM options:
 # drm:         General DRM code
-# i915kms:     Intel integrated GPUs, starting from the 830M family
-# radeonkms:   ATI Radeon cards
+# i915:                Intel integrated GPUs, starting from the 830M family
+# radeon:      ATI Radeon cards
 #
 # DRM_DEBUG:   include debug printfs, very slow
 #
 # DRM requires AGP in the kernel.
 
 device         drm
-#device                "i915kms"       # breaks VGA console, disabled by default
-#device                radeonkms       # breaks VGA console, disabled by default
+
+# For testing and debugging.
+device         "i915"
+device         radeon
 
 options        DRM_DEBUG
 options        DRM_LINUX