drm2: Hook to DragonFly's build infrastructure
authorFrançois Tigeot <ftigeot@wolfpond.org>
Thu, 7 Jun 2012 08:44:09 +0000 (10:44 +0200)
committerFrançois Tigeot <ftigeot@wolfpond.org>
Tue, 30 Jul 2013 19:54:34 +0000 (21:54 +0200)
* The drm2+i915 code is built as kernel modules only

* Remove unneeded dependency on 'mem' device

sys/bus/pci/vga_pci.c
sys/dev/Makefile
sys/dev/drm2/Makefile [new file with mode: 0644]
sys/dev/drm2/drm_drv.c
sys/dev/drm2/drmn/Makefile [new file with mode: 0644]
sys/dev/drm2/i915/Makefile [new file with mode: 0644]
sys/platform/pc64/Makefile.inc

index 94f6c57..c32587a 100644 (file)
@@ -71,6 +71,7 @@ vga_pci_attach(device_t dev)
 
        /* Always create a drm child for now to make it easier on drm. */
        device_add_child(dev, "drm", -1);
+       device_add_child(dev, "drmn", -1);
        bus_generic_attach(dev);
        return (0);
 }
index a32fdfc..100613b 100644 (file)
@@ -6,6 +6,7 @@ SUBDIR= \
        crypto \
        disk \
        drm \
+       drm2 \
        misc \
        netif \
        pccard \
diff --git a/sys/dev/drm2/Makefile b/sys/dev/drm2/Makefile
new file mode 100644 (file)
index 0000000..6ba4e0e
--- /dev/null
@@ -0,0 +1,3 @@
+SUBDIR = drmn i915
+
+.include <bsd.obj.mk>
index ced9308..f29b7a7 100644 (file)
@@ -82,7 +82,6 @@ DECLARE_MODULE(drmn, drm_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);
 MODULE_VERSION(drmn, 1);
 MODULE_DEPEND(drmn, agp, 1, 1, 1);
 MODULE_DEPEND(drmn, pci, 1, 1, 1);
-MODULE_DEPEND(drmn, mem, 1, 1, 1);
 MODULE_DEPEND(drmn, iicbus, 1, 1, 1);
 
 static drm_ioctl_desc_t                  drm_ioctls[256] = {
diff --git a/sys/dev/drm2/drmn/Makefile b/sys/dev/drm2/drmn/Makefile
new file mode 100644 (file)
index 0000000..ce455dd
--- /dev/null
@@ -0,0 +1,36 @@
+.PATH: ${.CURDIR}/..
+KMOD   = drmn
+SRCS   = \
+       drm_agpsupport.c \
+       drm_auth.c \
+       drm_bufs.c \
+       drm_context.c \
+       drm_crtc.c \
+       drm_crtc_helper.c \
+       drm_dma.c \
+       drm_dp_iic_helper.c \
+       drm_drawable.c \
+       drm_drv.c \
+       drm_edid.c \
+       drm_fb_helper.c \
+       drm_fops.c \
+       drm_gem.c \
+       drm_gem_names.c \
+       drm_hashtab.c \
+       drm_ioctl.c \
+       drm_irq.c \
+       drm_linux_list_sort.c \
+       drm_lock.c \
+       drm_memory.c \
+       drm_mm.c \
+       drm_modes.c \
+       drm_pci.c \
+       drm_scatter.c \
+       drm_sman.c \
+       drm_stub.c \
+       drm_sysctl.c \
+       drm_vm.c
+
+SRCS   += device_if.h bus_if.h pci_if.h device_if.h iicbus_if.h opt_drm.h \
+
+.include <bsd.kmod.mk>
diff --git a/sys/dev/drm2/i915/Makefile b/sys/dev/drm2/i915/Makefile
new file mode 100644 (file)
index 0000000..65f73d4
--- /dev/null
@@ -0,0 +1,32 @@
+KMOD   = i915kms
+SRCS   = \
+       i915_debug.c \
+       i915_dma.c \
+       i915_drv.c \
+       i915_gem.c \
+       i915_gem_execbuffer.c \
+       i915_gem_evict.c \
+       i915_gem_gtt.c \
+       i915_gem_tiling.c \
+       i915_irq.c \
+       i915_suspend.c \
+       intel_bios.c \
+       intel_crt.c \
+       intel_display.c \
+       intel_dp.c \
+       intel_fb.c \
+       intel_hdmi.c \
+       intel_iic.c \
+       intel_lvds.c \
+       intel_modes.c \
+       intel_opregion.c \
+       intel_overlay.c \
+       intel_panel.c \
+       intel_ringbuffer.c \
+       intel_sdvo.c \
+       intel_sprite.c \
+       intel_tv.c
+
+SRCS   += device_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h opt_drm.h
+
+.include <bsd.kmod.mk>
index 3ad0163..719d0df 100644 (file)
@@ -1,7 +1,7 @@
 # Used by the device build to check for device support
 #
 
-DEV_SUPPORT=   acpica agp bridge crypto disk drm misc netif \
+DEV_SUPPORT=   acpica agp bridge crypto disk drm drm2 misc netif \
                pccard powermng raid serial sound usbmisc video \
                virtual/virtio