head 1.19; access; symbols netbsd-11-0-RC4:1.19 netbsd-11-0-RC3:1.19 netbsd-11-0-RC2:1.19 netbsd-11-0-RC1:1.19 perseant-exfatfs-base-20250801:1.19 netbsd-11:1.19.0.8 netbsd-11-base:1.19 netbsd-10-1-RELEASE:1.18.4.1 perseant-exfatfs-base-20240630:1.19 perseant-exfatfs:1.19.0.6 perseant-exfatfs-base:1.19 netbsd-8-3-RELEASE:1.9 netbsd-9-4-RELEASE:1.12 netbsd-10-0-RELEASE:1.18.4.1 netbsd-10-0-RC6:1.18.4.1 netbsd-10-0-RC5:1.18.4.1 netbsd-10-0-RC4:1.18.4.1 netbsd-10-0-RC3:1.18.4.1 netbsd-10-0-RC2:1.18.4.1 thorpej-ifq:1.19.0.4 thorpej-ifq-base:1.19 thorpej-altq-separation:1.19.0.2 thorpej-altq-separation-base:1.19 netbsd-10-0-RC1:1.18.4.1 netbsd-10:1.18.0.4 netbsd-10-base:1.18 bouyer-sunxi-drm:1.18.0.2 bouyer-sunxi-drm-base:1.18 netbsd-9-3-RELEASE:1.12 thorpej-i2c-spi-conf2:1.14.0.6 thorpej-i2c-spi-conf2-base:1.14 thorpej-futex2:1.14.0.4 thorpej-futex2-base:1.14 thorpej-cfargs2:1.14.0.2 thorpej-cfargs2-base:1.14 cjep_sun2x-base1:1.14 cjep_sun2x:1.13.0.14 cjep_sun2x-base:1.13 cjep_staticlib_x-base1:1.13 netbsd-9-2-RELEASE:1.12 cjep_staticlib_x:1.13.0.12 cjep_staticlib_x-base:1.13 thorpej-i2c-spi-conf:1.13.0.10 thorpej-i2c-spi-conf-base:1.14 thorpej-cfargs:1.13.0.8 thorpej-cfargs-base:1.13 thorpej-futex:1.13.0.6 thorpej-futex-base:1.13 netbsd-9-1-RELEASE:1.12 bouyer-xenpvh-base2:1.13 phil-wifi-20200421:1.13 bouyer-xenpvh-base1:1.13 phil-wifi-20200411:1.13 bouyer-xenpvh:1.13.0.4 bouyer-xenpvh-base:1.13 is-mlppp:1.13.0.2 is-mlppp-base:1.13 phil-wifi-20200406:1.13 netbsd-8-2-RELEASE:1.9 ad-namecache-base3:1.13 netbsd-9-0-RELEASE:1.12 netbsd-9-0-RC2:1.12 ad-namecache-base2:1.12 ad-namecache-base1:1.12 ad-namecache:1.12.0.6 ad-namecache-base:1.12 netbsd-9-0-RC1:1.12 phil-wifi-20191119:1.12 netbsd-9:1.12.0.4 netbsd-9-base:1.12 phil-wifi-20190609:1.12 netbsd-8-1-RELEASE:1.9 netbsd-8-1-RC1:1.9 isaki-audio2:1.12.0.2 isaki-audio2-base:1.12 pgoyette-compat-merge-20190127:1.9.16.1 pgoyette-compat-20190127:1.11 pgoyette-compat-20190118:1.11 pgoyette-compat-1226:1.11 pgoyette-compat-1126:1.11 pgoyette-compat-1020:1.11 pgoyette-compat-0930:1.11 pgoyette-compat-0906:1.11 netbsd-7-2-RELEASE:1.3.2.2 pgoyette-compat-0728:1.9 netbsd-8-0-RELEASE:1.9 phil-wifi:1.9.0.18 phil-wifi-base:1.9 pgoyette-compat-0625:1.9 netbsd-8-0-RC2:1.9 pgoyette-compat-0521:1.9 pgoyette-compat-0502:1.9 pgoyette-compat-0422:1.9 netbsd-8-0-RC1:1.9 pgoyette-compat-0415:1.9 pgoyette-compat-0407:1.9 pgoyette-compat-0330:1.9 pgoyette-compat-0322:1.9 pgoyette-compat-0315:1.9 netbsd-7-1-2-RELEASE:1.3.2.2 pgoyette-compat:1.9.0.16 pgoyette-compat-base:1.9 netbsd-7-1-1-RELEASE:1.3.2.2 tls-maxphys-base-20171202:1.9 matt-nb8-mediatek:1.9.0.14 matt-nb8-mediatek-base:1.9 nick-nhusb-base-20170825:1.9 perseant-stdc-iso10646:1.9.0.12 perseant-stdc-iso10646-base:1.9 netbsd-8:1.9.0.10 netbsd-8-base:1.9 prg-localcount2-base3:1.9 prg-localcount2-base2:1.9 prg-localcount2-base1:1.9 prg-localcount2:1.9.0.8 prg-localcount2-base:1.9 pgoyette-localcount-20170426:1.9 bouyer-socketcan-base1:1.9 jdolecek-ncq:1.9.0.6 jdolecek-ncq-base:1.9 pgoyette-localcount-20170320:1.9 netbsd-7-1:1.3.2.2.0.6 netbsd-7-1-RELEASE:1.3.2.2 netbsd-7-1-RC2:1.3.2.2 nick-nhusb-base-20170204:1.9 netbsd-7-nhusb-base-20170116:1.3.2.2 bouyer-socketcan:1.9.0.4 bouyer-socketcan-base:1.9 pgoyette-localcount-20170107:1.9 netbsd-7-1-RC1:1.3.2.2 nick-nhusb-base-20161204:1.9 pgoyette-localcount-20161104:1.9 netbsd-7-0-2-RELEASE:1.3.2.2 nick-nhusb-base-20161004:1.9 localcount-20160914:1.9 netbsd-7-nhusb:1.3.2.2.0.4 netbsd-7-nhusb-base:1.3.2.2 pgoyette-localcount-20160806:1.9 pgoyette-localcount-20160726:1.9 pgoyette-localcount:1.9.0.2 pgoyette-localcount-base:1.9 nick-nhusb-base-20160907:1.9 nick-nhusb-base-20160529:1.9 netbsd-7-0-1-RELEASE:1.3.2.2 nick-nhusb-base-20160422:1.9 nick-nhusb-base-20160319:1.9 nick-nhusb-base-20151226:1.9 netbsd-7-0:1.3.2.2.0.2 netbsd-7-0-RELEASE:1.3.2.2 nick-nhusb-base-20150921:1.9 netbsd-7-0-RC3:1.3.2.2 netbsd-7-0-RC2:1.3.2.2 netbsd-7-0-RC1:1.3.2.2 nick-nhusb-base-20150606:1.9 nick-nhusb-base-20150406:1.9 nick-nhusb:1.7.0.2 nick-nhusb-base:1.7 tls-maxphys-base:1.3 tls-maxphys:1.3.0.4 netbsd-7:1.3.0.2 netbsd-7-base:1.3 yamt-pagecache:1.2.0.6 rmind-smpnet-base:1.2 rmind-smpnet:1.2.0.4 rmind-smpnet-nbase:1.2 yamt-pagecache-base9:1.2 tls-earlyentropy:1.2.0.2 tls-earlyentropy-base:1.3 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.2 riastradh-drm2-base3:1.1 riastradh-drm2:1.1.0.2; locks; strict; comment @# @; 1.19 date 2023.01.31.13.09.04; author riastradh; state Exp; branches; next 1.18; commitid lnFKjk9G6YAlaHbE; 1.18 date 2022.07.17.15.35.42; author riastradh; state Exp; branches 1.18.4.1; next 1.17; commitid htGOG5tSNBlflgMD; 1.17 date 2022.07.17.15.05.09; author riastradh; state Exp; branches; next 1.16; commitid ftLcbGehvXELagMD; 1.16 date 2022.07.17.14.11.40; author riastradh; state Exp; branches; next 1.15; commitid ZtojdFeOuzZpSfMD; 1.15 date 2021.12.19.11.54.24; author riastradh; state Exp; branches; next 1.14; commitid d7eObF37KhkQRflD; 1.14 date 2021.06.03.15.59.04; author nia; state Exp; branches; next 1.13; commitid vfG2miiiRQOkCHVC; 1.13 date 2020.02.14.09.35.52; author riastradh; state Exp; branches 1.13.10.1 1.13.14.1; next 1.12; commitid FV7002B5vqXwLCWB; 1.12 date 2019.02.17.04.05.47; author rin; state Exp; branches 1.12.6.1; next 1.11; commitid viEUadQYccaOx4cB; 1.11 date 2018.08.28.03.41.40; author riastradh; state Exp; branches; next 1.10; commitid UCntbWD2hrp00QPA; 1.10 date 2018.08.27.13.53.42; author riastradh; state Exp; branches; next 1.9; commitid XZcQgEAPB2IaqLPA; 1.9 date 2015.03.05.17.50.41; author riastradh; state Exp; branches 1.9.16.1 1.9.18.1; next 1.8; commitid DAvH2wkoIE72Arcy; 1.8 date 2015.03.05.17.42.48; author riastradh; state Exp; branches; next 1.7; commitid G0GQdnJBV9GJxrcy; 1.7 date 2014.11.22.19.18.07; author riastradh; state Exp; branches 1.7.2.1; next 1.6; commitid oolj4c9zbwwondZx; 1.6 date 2014.11.12.03.03.01; author christos; state Exp; branches; next 1.5; commitid ATSugOabEd05jQXx; 1.5 date 2014.11.12.02.13.30; author christos; state Exp; branches; next 1.4; commitid fCdzL6kue0l42QXx; 1.4 date 2014.11.11.11.30.21; author nonaka; state Exp; branches; next 1.3; commitid oYKu7moIjLWm8LXx; 1.3 date 2014.07.16.20.56.25; author riastradh; state Exp; branches 1.3.2.1 1.3.4.1; next 1.2; commitid HSaGIfvEpvYt4EIx; 1.2 date 2014.03.18.18.20.43; author riastradh; state Exp; branches 1.2.2.1 1.2.4.1 1.2.6.1; next 1.1; commitid YersUbOm2SKa4dtx; 1.1 date 2014.03.04.20.45.17; author riastradh; state dead; branches 1.1.2.1; next ; commitid JIh80eY5xBsJjqrx; 1.18.4.1 date 2023.02.22.18.34.30; author martin; state Exp; branches; next ; commitid xjEdTzg1vUe9gyeE; 1.13.10.1 date 2021.06.17.04.46.34; author thorpej; state Exp; branches; next ; commitid d7CrUzY34skBrrXC; 1.13.14.1 date 2021.06.06.20.30.53; author cjep; state Exp; branches; next ; commitid XNEGuB48YPLw17WC; 1.12.6.1 date 2020.02.29.20.21.05; author ad; state Exp; branches; next ; commitid OjSb8ro7YQETQBYB; 1.9.16.1 date 2018.09.06.06.56.43; author pgoyette; state Exp; branches; next ; commitid HCi1bXD317XIK0RA; 1.9.18.1 date 2019.06.10.22.09.21; author christos; state Exp; branches; next 1.9.18.2; commitid jtc8rnCzWiEEHGqB; 1.9.18.2 date 2020.04.08.14.08.55; author martin; state Exp; branches; next ; commitid Qli2aW9E74UFuA3C; 1.7.2.1 date 2015.04.06.15.18.21; author skrll; state Exp; branches; next ; commitid pz01Zhy7RP6iGxgy; 1.3.2.1 date 2015.01.11.05.59.18; author snj; state Exp; branches; next 1.3.2.2; commitid tIqDrPTMaOaMlz5y; 1.3.2.2 date 2015.03.06.21.39.11; author snj; state Exp; branches; next ; commitid pSdtnqChR7iEOAcy; 1.3.4.1 date 2014.07.16.20.56.25; author tls; state dead; branches; next 1.3.4.2; commitid jTnpym9Qu0o4R1Nx; 1.3.4.2 date 2014.08.20.00.04.32; author tls; state Exp; branches; next 1.3.4.3; commitid jTnpym9Qu0o4R1Nx; 1.3.4.3 date 2017.12.03.11.38.52; author jdolecek; state Exp; branches; next ; commitid XcIYRZTAh1LmerhA; 1.2.2.1 date 2014.08.10.06.56.10; author tls; state Exp; branches; next ; commitid i4aS5ndhchyrCMLx; 1.2.4.1 date 2014.03.18.18.20.43; author rmind; state dead; branches; next 1.2.4.2; commitid mL5ZYSzpqK6QS2Bx; 1.2.4.2 date 2014.05.18.17.46.11; author rmind; state Exp; branches; next ; commitid mL5ZYSzpqK6QS2Bx; 1.2.6.1 date 2014.03.18.18.20.43; author yamt; state dead; branches; next 1.2.6.2; commitid VUUXuyNWnt3AKwBx; 1.2.6.2 date 2014.05.22.11.41.07; author yamt; state Exp; branches; next ; commitid VUUXuyNWnt3AKwBx; 1.1.2.1 date 2014.03.04.20.45.17; author riastradh; state Exp; branches; next ; commitid JIh80eY5xBsJjqrx; desc @@ 1.19 log @sys/modules/drmkms: Remove GPU scheduler files. These have been moved out to drmkms_sched.kmod. XXX pullup-10 @ text @# $NetBSD: Makefile,v 1.18 2022/07/17 15:35:42 riastradh Exp $ .include "../Makefile.inc" .include "Makefile.inc" KMOD= drmkms MKLDSCRIPT=yes .PATH: ${S}/external/bsd/drm2/drm .PATH: ${S}/external/bsd/drm2/i2c .PATH: ${S}/external/bsd/drm2/pci .PATH: ${S}/external/bsd/drm2/dist/drm .PATH: ${S}/external/bsd/drm2/dist/drm/scheduler # NetBSD additions. SRCS+= drm_agp_hook.c SRCS+= drm_cdevsw.c SRCS+= drm_gem_vm.c SRCS+= drm_module.c SRCS+= drm_sysctl.c # pci bus ids -- doesn't depend on all of pci, just the header files SRCS+= drm_pci_busid.c # Generic, unaccelerated kms framebuffer. SRCS+= drmfb.c # XXX ttm CPPFLAGS+= -I. # XXX CWARNFLAGS.foo.c doesn't work. COPTS.drm_atomic_helper.c+= -Wno-shadow COPTS.drm_bufs.c+= -Wno-pointer-arith COPTS.drm_crtc.c+= -Wno-missing-field-initializers COPTS.drm_crtc.c+= -Wno-pointer-arith COPTS.drm_crtc.c+= -Wno-shadow COPTS.drm_client_modeset.c+= -Wno-shadow COPTS.drm_dp_helper.c+= -Wno-pointer-arith COPTS.drm_fb_helper.c+= -Wno-shadow COPTS.drm_edid.c+= -Wno-shadow COPTS.drm_ioctl.c+= -Wno-shadow COPTS.drm_mm.c+= ${${ACTIVE_CC} == clang :? -Wno-unused-function :} COPTS.drm_modes.c+= -Wno-shadow # Legacy user-mode setting SRCS+= drm_bufs.c SRCS+= drm_context.c SRCS+= drm_dma.c SRCS+= drm_legacy_misc.c SRCS+= drm_lock.c SRCS+= drm_scatter.c # GPU scheduler is separatd out into drmkms_sched.kmod # Upstream source files. #SRCS+= drm_agpsupport.c SRCS+= drm_atomic.c SRCS+= drm_atomic_helper.c SRCS+= drm_atomic_state_helper.c SRCS+= drm_atomic_uapi.c SRCS+= drm_auth.c SRCS+= drm_blend.c SRCS+= drm_bridge.c SRCS+= drm_cache.c SRCS+= drm_client.c SRCS+= drm_client_modeset.c SRCS+= drm_color_mgmt.c SRCS+= drm_connector.c SRCS+= drm_crtc.c SRCS+= drm_crtc_helper.c SRCS+= drm_damage_helper.c SRCS+= drm_dp_dual_mode_helper.c SRCS+= drm_dp_helper.c SRCS+= drm_dp_mst_topology.c SRCS+= drm_drv.c SRCS+= drm_dsc.c SRCS+= drm_dumb_buffers.c SRCS+= drm_edid.c SRCS+= drm_encoder.c SRCS+= drm_encoder_slave.c SRCS+= drm_fb_helper.c SRCS+= drm_file.c SRCS+= drm_flip_work.c #SRCS+= drm_format_helper.c SRCS+= drm_fourcc.c SRCS+= drm_framebuffer.c SRCS+= drm_gem.c SRCS+= drm_gem_cma_helper.c SRCS+= drm_gem_framebuffer_helper.c SRCS+= drm_hashtab.c SRCS+= drm_hdcp.c SRCS+= drm_ioctl.c SRCS+= drm_irq.c #SRCS+= drm_kms_helper_common.c SRCS+= drm_lease.c SRCS+= drm_memory.c SRCS+= drm_mm.c SRCS+= drm_mode_config.c SRCS+= drm_mode_object.c SRCS+= drm_modes.c SRCS+= drm_modeset_helper.c SRCS+= drm_modeset_lock.c SRCS+= drm_panel.c SRCS+= drm_panel_orientation_quirks.c #SRCS+= drm_pci.c SRCS+= drm_plane.c SRCS+= drm_plane_helper.c SRCS+= drm_prime.c SRCS+= drm_print.c SRCS+= drm_probe_helper.c SRCS+= drm_property.c SRCS+= drm_rect.c SRCS+= drm_scdc_helper.c SRCS+= drm_self_refresh_helper.c #SRCS+= drm_simple_kms_helper.c SRCS+= drm_syncobj.c SRCS+= drm_sysfs.c SRCS+= drm_trace_points.c SRCS+= drm_vblank.c SRCS+= drm_vm.c SRCS+= drm_vma_manager.c SRCS+= drm_writeback.c WARNS= 3 .include @ 1.18 log @drm: Include GPU scheduler in drmkms.kmod. Could be split into a separate module, but whatever. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2022/07/17 15:05:09 riastradh Exp $ d55 1 a55 4 # GPU scheduler SRCS+= sched_entity.c SRCS+= sched_fence.c SRCS+= sched_main.c @ 1.18.4.1 log @Pull up following revision(s) (requested by riastradh in ticket #97): sys/modules/drmkms/Makefile: revision 1.19 sys/modules/drmkms_pci/Makefile: revision 1.11 sys/modules/drmkms: Remove GPU scheduler files. These have been moved out to drmkms_sched.kmod. sys/modules/drmkms_pci: Remove drm_agpsupport.c. This was moved to a separate drmkms_agp module. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.18 2022/07/17 15:35:42 riastradh Exp $ d55 4 a58 1 # GPU scheduler is separatd out into drmkms_sched.kmod @ 1.17 log @drm: Sync module/drmkms/Makefile with files.drmkms. Unconditionally include legacy APIs for viadrmums. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.16 2022/07/17 14:11:40 riastradh Exp $ d14 1 d55 5 @ 1.16 log @drm: Dust off module build a little. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.15 2021/12/19 11:54:24 riastradh Exp $ a18 1 SRCS+= drm_hdcp.c d22 1 a29 3 # Code imported from Linux - expects signed overflow to be OK. COPTS+= -fwrapv d46 8 d55 1 a55 1 #SRCS+= drm_agpsupport.c # Moved to drmkms_pci module. d81 1 d90 1 a90 1 #SRCS+= drm_hdcp.c # Local override. a92 1 SRCS+= drm_lock.c d104 1 a104 1 #SRCS+= drm_pci.c # Moved to drmkms_pci module. @ 1.15 log @drm: Sync (device-independent) drmkms*.kmod makefiles. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2021/06/03 15:59:04 nia Exp $ a43 1 COPTS.drm_edid.c+= -Wno-error=attributes d46 1 @ 1.14 log @build the drmkms modules with -fwrapv too @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.13 2020/02/14 09:35:52 riastradh Exp $ a17 1 SRCS+= drm_gem_cma_helper.c d19 1 d23 2 d41 1 d43 2 d47 1 a49 1 #SRCS+= ati_pcigart.c # Moved to drmkms_pci module. d53 2 d56 1 a57 1 SRCS+= drm_bufs.c d59 4 a62 1 SRCS+= drm_context.c d65 2 a66 2 SRCS+= drm_debugfs.c SRCS+= drm_dma.c d70 2 d73 1 d77 3 a79 1 SRCS+= drm_fops.c d81 2 a82 1 SRCS+= drm_global.c d84 1 a84 1 #SRCS+= drm_info.c # XXX Rewrite for sysctl or something. d88 2 d92 2 d95 1 d97 2 d100 1 d102 2 a103 2 #SRCS+= drm_platform.c # XXX Rewrite per platform. #SRCS+= drm_prime.c # XXX Revisit later. d105 1 d107 4 a110 1 SRCS+= drm_scatter.c d113 1 d116 1 @ 1.13 log @Carry new CWARNFLAGS over to module reachover makefiles. Forgot these modules existed! @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.12 2019/02/17 04:05:47 rin Exp $ d28 3 @ 1.13.10.1 log @Sync w/ HEAD. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2021/06/03 15:59:04 nia Exp $ a27 3 # Code imported from Linux - expects signed overflow to be OK. COPTS+= -fwrapv @ 1.13.14.1 log @sync with head @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2021/06/03 15:59:04 nia Exp $ a27 3 # Code imported from Linux - expects signed overflow to be OK. COPTS+= -fwrapv @ 1.12 log @Bump default value of WARNS for modules from 3 to 5, and explicitly set WARNS for modules that fail with WARNS=5. Also, turn on -Wno-missing-noreturn for clang for some files. At the moment, among ~ 360 modules, - 2 (lua and zfs) need WARNS=0 - 1 (solaris) needs WARNS=1 - 136 need WARNS=3 (mostly due to sign-compare) - 4 need WARNS=4 - others can be compiled with WARNS=5 Discussed on tech-kern. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2018/08/28 03:41:40 riastradh Exp $ d32 1 d34 1 d36 1 @ 1.12.6.1 log @Sync with head. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.13 2020/02/14 09:35:52 riastradh Exp $ a31 1 COPTS.drm_bufs.c+= -Wno-pointer-arith a32 1 COPTS.drm_crtc.c+= -Wno-pointer-arith a33 1 COPTS.drm_dp_helper.c+= -Wno-pointer-arith @ 1.11 log @Rework PCI and AGP conditionalization. - Push drm_pci_set_unique into driver callback. - Eliminate drm_pci_set_unique_hook. - Gather all drm_agp_* functions into struct drm_agp_hooks. - Replace the nonsensical old atomic garbage by serious locking. - Make drm_agpsupport.c its own module. - Eliminate NDRMKMS_PCI. - Use NAGP from "agp.h" only in drm_module.c for horrible hack. => See comment in file for rationale. - Always define CONFIG_PCI=1 and CONFIG_AGP=1. - Always go through the drm_agp_* function hooks. - Ifdef out nouveau agp stuff that doesn't go through drm_agp_* for reasons that I'm too frustrated to figure out tonight. - pci_iomap no longer automagically does agp_i810_borrow. => Use drm_agp_borrow instead. @ text @d1 1 a1 1 # $NetBSD$ d82 2 @ 1.10 log @Make drmkms.kmod build again on amd64. @ text @d16 1 d28 2 @ 1.9 log @Factor generic parts of intelfb out into a drmfb. Adapting radeondrmkmsfb should not be hard. This will make nouveaufb easier too. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2015/03/05 17:42:48 riastradh Exp $ d6 3 d12 1 d15 18 a32 2 MKLDSCRIPT=yes KMOD= drmkms d37 2 d40 1 a40 1 SRCS+= drm_buffer.c d46 1 d49 1 d53 1 a53 1 SRCS+= drm_fb_helper.c # XXX Rewrite for wsconsole. a59 1 #SRCS+= drm_ioc32.c d66 1 a73 2 SRCS+= drm_stub.c SRCS+= drm_sysctl.c d75 1 a78 11 # NetBSD additions. SRCS+= drm_gem_vm.c SRCS+= drm_module.c SRCS+= drmfb.c COPTS.drm_crtc.c+= -Wno-shadow COPTS.drm_crtc.c+= -Wno-missing-field-initializers COPTS.drm_edid.c+= -Wno-shadow CPPFLAGS+= -DNACPICA=1 @ 1.9.18.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.12 2019/02/17 04:05:47 rin Exp $ a5 3 KMOD= drmkms MKLDSCRIPT=yes a8 1 d11 2 a12 21 # NetBSD additions. SRCS+= drm_agp_hook.c SRCS+= drm_cdevsw.c SRCS+= drm_gem_cma_helper.c SRCS+= drm_gem_vm.c SRCS+= drm_module.c SRCS+= drm_sysctl.c # Generic, unaccelerated kms framebuffer. SRCS+= drmfb.c # XXX ttm CPPFLAGS+= -I. # XXX CWARNFLAGS.foo.c doesn't work. COPTS.drm_atomic_helper.c+= -Wno-shadow COPTS.drm_crtc.c+= -Wno-missing-field-initializers COPTS.drm_crtc.c+= -Wno-shadow COPTS.drm_edid.c+= -Wno-shadow COPTS.drm_ioctl.c+= -Wno-shadow a16 2 SRCS+= drm_atomic.c SRCS+= drm_atomic_helper.c d18 1 a18 1 SRCS+= drm_bridge.c a23 1 SRCS+= drm_debugfs.c a25 1 SRCS+= drm_dp_mst_topology.c d29 1 a29 1 SRCS+= drm_fb_helper.c d36 1 a42 1 SRCS+= drm_modeset_lock.c d50 2 a52 1 SRCS+= drm_trace_points.c d56 10 a65 1 WARNS= 3 @ 1.9.18.2 log @Merge changes from current as of 20200406 @ text @d1 1 a1 1 # $NetBSD$ a31 1 COPTS.drm_bufs.c+= -Wno-pointer-arith a32 1 COPTS.drm_crtc.c+= -Wno-pointer-arith a33 1 COPTS.drm_dp_helper.c+= -Wno-pointer-arith @ 1.9.16.1 log @Sync with HEAD Resolve a couple of conflicts (result of the uimin/uimax changes) @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2018/08/28 03:41:40 riastradh Exp $ a5 3 KMOD= drmkms MKLDSCRIPT=yes a8 1 d11 2 a12 21 # NetBSD additions. SRCS+= drm_agp_hook.c SRCS+= drm_cdevsw.c SRCS+= drm_gem_cma_helper.c SRCS+= drm_gem_vm.c SRCS+= drm_module.c SRCS+= drm_sysctl.c # Generic, unaccelerated kms framebuffer. SRCS+= drmfb.c # XXX ttm CPPFLAGS+= -I. # XXX CWARNFLAGS.foo.c doesn't work. COPTS.drm_atomic_helper.c+= -Wno-shadow COPTS.drm_crtc.c+= -Wno-missing-field-initializers COPTS.drm_crtc.c+= -Wno-shadow COPTS.drm_edid.c+= -Wno-shadow COPTS.drm_ioctl.c+= -Wno-shadow a16 2 SRCS+= drm_atomic.c SRCS+= drm_atomic_helper.c d18 1 a18 1 SRCS+= drm_bridge.c a23 1 SRCS+= drm_debugfs.c a25 1 SRCS+= drm_dp_mst_topology.c d29 1 a29 1 SRCS+= drm_fb_helper.c d36 1 a42 1 SRCS+= drm_modeset_lock.c d50 2 a52 1 SRCS+= drm_trace_points.c d56 11 @ 1.8 log @Rewrite drm_encoder_slave.c, as nouveau will need. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2014/11/22 19:18:07 riastradh Exp $ d59 1 @ 1.7 log @Move all PCI/AGP code back to drmkms_pci module where it belongs. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2014/11/12 03:03:01 christos Exp $ d7 1 d28 1 a28 1 #SRCS+= drm_encoder_slave.c # XXX Rewrite for i2c. @ 1.7.2.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2015/03/05 17:50:41 riastradh Exp $ a6 1 .PATH: ${S}/external/bsd/drm2/i2c d27 1 a27 1 SRCS+= drm_encoder_slave.c a57 1 SRCS+= drmfb.c @ 1.6 log @this module needs MKLDSCRIPT too now @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2014/11/12 02:13:30 christos Exp $ d15 1 a15 1 SRCS+= drm_agpsupport.c # Moved to drmkms_pci module. @ 1.5 log @make this work: add agpsupport and sysctl code @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2014/11/11 11:30:21 nonaka Exp $ d10 1 @ 1.4 log @fix build failure. > /tmp/bracket/build/2014.11.10.22.43.46-i386/src/sys/external/bsd/drm2/include/linux/pci.h:36:20: fatal error: acpica.h: No such file or directory @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2014/07/16 20:56:25 riastradh Exp $ d14 1 a14 1 #SRCS+= drm_agpsupport.c # Moved to drmkms_pci module. d49 1 @ 1.3 log @Make it build and boot on my test machines. Screen blanks on boot on the Ivy Bridge system with DRM error in cpt_serr_int_handler: PCH transcoder A FIFO underrun But after that everything is OK. Appears to be an upstream problem. To investigate... I think there's a cache flushing issue somewhere -- there are little display artefacts on my T60. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2014/03/18 18:20:43 riastradh Exp $ d61 2 @ 1.3.2.1 log @Pull up following revision(s) (requested by chs in ticket #401): distrib/sets/lists/modules/md.amd64: revisions 1.46, 1.47 via patch distrib/sets/lists/modules/md.i386: revisions 1.49, 1.50 sys/dev/ic/pcdisplayvar.h: revision 1.20 sys/dev/ic/vgavar.h: revision 1.32 sys/external/bsd/drm/dist/bsd-core/drm_drv.c: revision 1.26 sys/external/bsd/drm2/dist/drm/drm_agpsupport.c: revisions 1.5, 1.6 sys/external/bsd/drm2/dist/drm/drm_pci.c: revisions 1.4, 1.5 sys/external/bsd/drm2/dist/drm/drm_stub.c: revisions 1.6-1.8 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h: revision 1.11 sys/external/bsd/drm2/dist/drm/radeon/cik.c: revision 1.3 sys/external/bsd/drm2/dist/drm/radeon/ni.c: revision 1.3 sys/external/bsd/drm2/dist/drm/radeon/si.c: revision 1.3 sys/external/bsd/drm2/dist/include/drm/drmP.h: revisions 1.8, 1.9 sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h: revisions 1.3, 1.4 sys/external/bsd/drm2/drm/drm_drv.c: revision 1.11 sys/external/bsd/drm2/drm/drm_module.c: revision 1.9 sys/external/bsd/drm2/drm/drm_sysctl.c: revisions 1.1-1.4 sys/external/bsd/drm2/drm/drm_vm.c: revision 1.7 sys/external/bsd/drm2/drm/files.drmkms: revisions 1.8, 1.9 sys/external/bsd/drm2/i915drm/files.i915drmkms: revision 1.9 sys/external/bsd/drm2/i915drm/i915_module.c: revisions 1.4, 1.5 sys/external/bsd/drm2/include/drm/drm_sysctl.h: revisions 1.1, 1.2 sys/external/bsd/drm2/include/linux/hdmi.h: revisions 1.3-1.5 sys/external/bsd/drm2/include/linux/module.h: revision 1.5 sys/external/bsd/drm2/include/linux/moduleparam.h: revisions 1.3, 1.4 sys/external/bsd/drm2/include/linux/pci.h: revision 1.11 sys/external/bsd/drm2/linux/linux_module.c: revision 1.5 sys/external/bsd/drm2/nouveau/files.nouveau: revision 1.4 sys/external/bsd/drm2/nouveau/nouveau_module.c: revision 1.3 sys/external/bsd/drm2/pci/drm_pci.c: revision 1.8 sys/external/bsd/drm2/pci/drm_pci_module.c: revision 1.3 sys/external/bsd/drm2/radeon/radeon_module.c: revision 1.3 sys/external/bsd/drm2/ttm/files.ttm: revision 1.1 sys/modules/drm2pci/Makefile: file removal sys/modules/drmkms/Makefile: revisions 1.4-1.7 sys/modules/drmkms_linux/Makefile: revision 1.5 sys/modules/drmkms_pci/Makefile: revisions 1.3, 1.4 sys/modules/i915drmkms/Makefile: revisions 1.5-1.7 Split drm ttm config into a separate file. -- Fix module build of drmkms_linux. -- Remove vestigial drm2pci module, replaced by drmkms_pci. -- fix the module class. -- add the drmkms modules -- make a drm_agp_destroy() function to resolve the circular dependency between drmkms and drmkms_pci -- finalize the idr code. -- add drm_agp_destroy -- fix drmkms module path for xen. -- fix build failure. /tmp/bracket/build/2014.11.10.22.43.46-i386/src/sys/external/bsd/drm2/include/linux/pci.h:36:20: fatal error: acpica.h: No such file or directory -- make this work: add agpsupport and sysctl code -- move agpsupport to drmkms to avoid circular dependencies. -- turn on dynamic ldscript creation to handle link set symbol definitions used in the automatic sysctl creation. -- Add __link_set based code to automatically convert the linux module parameters into sysctls. -- this module needs MKLDSCRIPT too now -- more _KERNEL_OPT -- prettify and add to all the modules that have it. -- fix description setting. -- Adjust flags to allow building with clang. -- Fix build with clang. -- Drop casts in favour of expressions that actually give the right pointer. -- Move all PCI/AGP code back to drmkms_pci module where it belongs. -- Use correct length for hdmi_infoframe_header_pack in . Fixes PR kern/49411. -- Back out previous, fix PR kern/49411 correctly. frame->header.length is not initialized in the vendor packet case. Instead, make hdmi_infoframe_header_pack take the packet length and subtract the size of the header when packing the header. (Could make it take the payload length instead, but for callers it is more convenient to have a name for the whole packet length.) -- Fix bounds checking in hdmi_infoframe_header_pack (PR kern/49411). -- Trivial build fix for no options SYSCTL_INCLUDE_DESCR case, to avoid -Werror. OK christos@@ and riastradh@@ -- fix debugging compilation (ALL kernel) -- nouveau_nv50_fence.c needs -Wno-shadow. -- fix a confusion between dev_t and devmajor_t, and include the primary minor when calling makedev(). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2014/07/16 20:56:25 riastradh Exp $ a9 1 MKLDSCRIPT=yes a48 1 SRCS+= drm_sysctl.c a60 2 CPPFLAGS+= -DNACPICA=1 @ 1.3.2.2 log @Pull up following revision(s) (requested by mrg in ticket #573): sys/external/bsd/common/include/linux/kernel.h: 1.5, 1.6 sys/external/bsd/drm2/dist/drm/drm_ioctl.c: 1.4 sys/external/bsd/drm2/dist/drm/drm_irq.c: 1.6-1.8 sys/external/bsd/drm2/dist/drm/i915/i915_dma.c: 1.13-1.15 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: 1.23-1.27 sys/external/bsd/drm2/dist/drm/i915/i915_gem_execbuffer.c: 1.5 sys/external/bsd/drm2/dist/drm/i915/intel_display.c: 1.14, 1.15 sys/external/bsd/drm2/dist/drm/i915/intel_dp.c: 1.10 sys/external/bsd/drm2/dist/drm/i915/intel_drv.h: 1.8 sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c: 1.8-1.13 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: 1.6 sys/external/bsd/drm2/dist/drm/i915/intel_ringbuffer.c: 1.5, 1.6 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/device/nouveau_engine_device_base.c: 1.4 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c: 1.3, 1.4 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c: 1.3, 1.4 sys/external/bsd/drm2/dist/drm/nouveau/core/include/core/device.h: 1.4 sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/mc.h: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/include/subdev/pwr.h: 1.3, 1.4 sys/external/bsd/drm2/dist/drm/nouveau/core/os.h: 1.4, 1.5 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_base.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/bios/nouveau_subdev_bios_pll.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_base.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/clock/nouveau_subdev_clock_nv50.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/fbmem.h: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/devinit/nouveau_subdev_devinit_nv04.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_nv50.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nouveau_subdev_fb_nvc0.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nv50.h: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/fb/nvc0.h: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mc/nouveau_subdev_mc_base.c: 1.2, 1.3 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/mxm/nouveau_subdev_mxm_nv50.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/pwr/nouveau_subdev_pwr_base.c: 1.3, 1.4 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/therm/nouveau_subdev_therm_ic.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/timer/nouveau_subdev_timer_nv04.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nouveau_subdev_vm_base.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nouveau_subdev_vm_nv04.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nouveau_subdev_vm_nv44.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/core/subdev/vm/nv04.h: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.h: 1.3 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drm.c: 1.4, 1.5 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_fbcon.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c: 1.3 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv84_fence.c: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.c: 1.3 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_ttm.h: 1.2 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_vga.h: 1.2 sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c: 1.6-1.8 sys/external/bsd/drm2/dist/drm/radeon/radeon_pm.c: 1.3 sys/external/bsd/drm2/dist/drm/radeon/rs400.c: 1.3 sys/external/bsd/drm2/dist/drm/via/via_dmablit.c: 1.3, 1.4 sys/external/bsd/drm2/dist/drm/via/via_drv.h: 1.3 sys/external/bsd/drm2/dist/drm/via/via_irq.c: 1.3, 1.4 sys/external/bsd/drm2/dist/drm/via/via_video.c: 1.3, 1.4 sys/external/bsd/drm2/dist/include/drm/drmP.h: 1.10 sys/external/bsd/drm2/dist/include/drm/drm_crtc.h: 1.4 sys/external/bsd/drm2/dist/include/drm/drm_modes.h: 1.3 sys/external/bsd/drm2/dist/uapi/drm/i915_drm.h: 1.2 sys/external/bsd/drm2/drm/drm_cache.c: 1.4-1.6 sys/external/bsd/drm2/drm/drm_drv.c: 1.14 sys/external/bsd/drm2/drm/drm_module.c: 1.10 sys/external/bsd/drm2/drm/drm_sysctl.c: 1.5 sys/external/bsd/drm2/drm/drm_vma_manager.c: 1.2 sys/external/bsd/drm2/drm/drmfb.c: 1.1 sys/external/bsd/drm2/drm/files.drmkms: 1.10, 1.11 sys/external/bsd/drm2/i2c/drm_encoder_slave.c: 1.1 sys/external/bsd/drm2/i915drm/files.i915drmkms: 1.7, 1.10 sys/external/bsd/drm2/i915drm/intelfb.c: 1.11, 1.12 sys/external/bsd/drm2/include/asm/io.h: 1.4 sys/external/bsd/drm2/include/asm/unaligned.h: 1.2, 1.3 sys/external/bsd/drm2/include/drm/drm_encoder_slave.h: 1.1 sys/external/bsd/drm2/include/drm/drm_wait_netbsd.h: 1.7-1.11 sys/external/bsd/drm2/include/drm/drmfb.h: 1.1 sys/external/bsd/drm2/include/drm/drmfb_pci.h: 1.1, 1.2 sys/external/bsd/drm2/include/linux/bitops.h: 1.9 sys/external/bsd/drm2/include/linux/i2c.h: 1.7, 1.8 sys/external/bsd/drm2/include/linux/io-mapping.h: 1.5 sys/external/bsd/drm2/include/linux/moduleparam.h: 1.5 sys/external/bsd/drm2/include/linux/pci.h: 1.12-1.15 sys/external/bsd/drm2/include/linux/pm.h: 1.4 sys/external/bsd/drm2/include/linux/reboot.h: 1.2 sys/external/bsd/drm2/include/linux/slab.h: 1.5 sys/external/bsd/drm2/include/linux/string.h: 1.4 sys/external/bsd/drm2/include/linux/vgaarb.h: 1.3 sys/external/bsd/drm2/include/linux/ww_mutex.h: 1.10 sys/external/bsd/drm2/linux/files.drmkms_linux: 1.8 sys/external/bsd/drm2/linux/linux_i2c.c: 1.3 sys/external/bsd/drm2/linux/linux_ww_mutex.c: 1.1 sys/external/bsd/drm2/nouveau/files.nouveau: 1.5-1.8 sys/external/bsd/drm2/nouveau/nouveau_pci.c: 1.1-1.3 sys/external/bsd/drm2/nouveau/nouveau_pci.h: 1.1 sys/external/bsd/drm2/nouveau/nouveau_sysfs.c: 1.1 sys/external/bsd/drm2/nouveau/nouveau_vga.c: 1.1 sys/external/bsd/drm2/nouveau/nouveaufb.c: 1.1 sys/external/bsd/drm2/nouveau/nouveaufb.h: 1.1 sys/external/bsd/drm2/pci/drm_pci.c: 1.10-1.12 sys/external/bsd/drm2/pci/drm_pci_module.c: 1.4 sys/external/bsd/drm2/pci/drmfb_pci.c: 1.1-1.3 sys/external/bsd/drm2/pci/files.drmkms_pci: 1.5 sys/external/bsd/drm2/radeon/radeon_pci.c: 1.5-1.7 sys/modules/drmkms/Makefile: 1.8, 1.9 sys/modules/drmkms_linux/Makefile: 1.6 sys/modules/drmkms_pci/Makefile: 1.5 sync drm2 with HEAD. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3.2.1 2015/01/11 05:59:18 snj Exp $ a6 1 .PATH: ${S}/external/bsd/drm2/i2c d27 1 a27 1 SRCS+= drm_encoder_slave.c a57 1 SRCS+= drmfb.c @ 1.3.4.1 log @file Makefile was added on branch tls-maxphys on 2014-08-20 00:04:32 +0000 @ text @d1 61 @ 1.3.4.2 log @Rebase to HEAD as of a few days ago. @ text @a0 61 # $NetBSD$ .include "../Makefile.inc" .include "Makefile.inc" .PATH: ${S}/external/bsd/drm2/drm .PATH: ${S}/external/bsd/drm2/pci .PATH: ${S}/external/bsd/drm2/dist/drm KMOD= drmkms # Upstream source files. #SRCS+= ati_pcigart.c # Moved to drmkms_pci module. #SRCS+= drm_agpsupport.c # Moved to drmkms_pci module. SRCS+= drm_auth.c SRCS+= drm_buffer.c SRCS+= drm_bufs.c SRCS+= drm_cache.c SRCS+= drm_context.c SRCS+= drm_crtc.c SRCS+= drm_crtc_helper.c SRCS+= drm_dma.c SRCS+= drm_dp_helper.c SRCS+= drm_drv.c SRCS+= drm_edid.c #SRCS+= drm_encoder_slave.c # XXX Rewrite for i2c. SRCS+= drm_fb_helper.c # XXX Rewrite for wsconsole. SRCS+= drm_flip_work.c SRCS+= drm_fops.c SRCS+= drm_gem.c SRCS+= drm_global.c SRCS+= drm_hashtab.c #SRCS+= drm_info.c # XXX Rewrite for sysctl or something. #SRCS+= drm_ioc32.c SRCS+= drm_ioctl.c SRCS+= drm_irq.c SRCS+= drm_lock.c SRCS+= drm_memory.c SRCS+= drm_mm.c SRCS+= drm_modes.c #SRCS+= drm_pci.c # Moved to drmkms_pci module. SRCS+= drm_plane_helper.c #SRCS+= drm_platform.c # XXX Rewrite per platform. #SRCS+= drm_prime.c # XXX Revisit later. SRCS+= drm_probe_helper.c SRCS+= drm_rect.c SRCS+= drm_scatter.c SRCS+= drm_stub.c SRCS+= drm_sysfs.c SRCS+= drm_vm.c SRCS+= drm_vma_manager.c # NetBSD additions. SRCS+= drm_gem_vm.c SRCS+= drm_module.c COPTS.drm_crtc.c+= -Wno-shadow COPTS.drm_crtc.c+= -Wno-missing-field-initializers COPTS.drm_edid.c+= -Wno-shadow .include @ 1.3.4.3 log @update from HEAD @ text @a6 1 .PATH: ${S}/external/bsd/drm2/i2c a9 1 MKLDSCRIPT=yes d26 1 a26 1 SRCS+= drm_encoder_slave.c a48 1 SRCS+= drm_sysctl.c a55 1 SRCS+= drmfb.c a60 2 CPPFLAGS+= -DNACPICA=1 @ 1.2 log @Merge riastradh-drm2 to HEAD. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1.2.1 2014/03/04 20:45:17 riastradh Exp $ a10 1 IOCONF= drmkms.ioconf d28 1 d42 1 d45 2 a46 1 #SRCS+= drm_proc.c # XXX Rewrite for sysctl. d49 1 d51 1 a55 1 SRCS+= drm_sysfs.c d58 1 @ 1.2.2.1 log @Rebase. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2014/07/16 20:56:25 riastradh Exp $ d11 1 a28 1 SRCS+= drm_flip_work.c a41 1 SRCS+= drm_plane_helper.c d44 1 a44 2 SRCS+= drm_probe_helper.c SRCS+= drm_rect.c a46 1 SRCS+= drm_sysfs.c a47 1 SRCS+= drm_vma_manager.c d52 1 a54 1 COPTS.drm_crtc.c+= -Wno-missing-field-initializers @ 1.2.6.1 log @file Makefile was added on branch yamt-pagecache on 2014-05-22 11:41:07 +0000 @ text @d1 57 @ 1.2.6.2 log @sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") @ text @a0 57 # $NetBSD$ .include "../Makefile.inc" .include "Makefile.inc" .PATH: ${S}/external/bsd/drm2/drm .PATH: ${S}/external/bsd/drm2/pci .PATH: ${S}/external/bsd/drm2/dist/drm KMOD= drmkms IOCONF= drmkms.ioconf # Upstream source files. #SRCS+= ati_pcigart.c # Moved to drmkms_pci module. #SRCS+= drm_agpsupport.c # Moved to drmkms_pci module. SRCS+= drm_auth.c SRCS+= drm_buffer.c SRCS+= drm_bufs.c SRCS+= drm_cache.c SRCS+= drm_context.c SRCS+= drm_crtc.c SRCS+= drm_crtc_helper.c SRCS+= drm_dma.c SRCS+= drm_dp_helper.c SRCS+= drm_drv.c SRCS+= drm_edid.c #SRCS+= drm_encoder_slave.c # XXX Rewrite for i2c. SRCS+= drm_fb_helper.c # XXX Rewrite for wsconsole. SRCS+= drm_fops.c SRCS+= drm_gem.c SRCS+= drm_global.c SRCS+= drm_hashtab.c #SRCS+= drm_info.c # XXX Rewrite for sysctl or something. #SRCS+= drm_ioc32.c SRCS+= drm_ioctl.c SRCS+= drm_irq.c SRCS+= drm_lock.c SRCS+= drm_memory.c SRCS+= drm_mm.c SRCS+= drm_modes.c #SRCS+= drm_pci.c # Moved to drmkms_pci module. #SRCS+= drm_platform.c # XXX Rewrite per platform. #SRCS+= drm_prime.c # XXX Revisit later. #SRCS+= drm_proc.c # XXX Rewrite for sysctl. SRCS+= drm_scatter.c SRCS+= drm_stub.c SRCS+= drm_vm.c # NetBSD additions. SRCS+= drm_gem_vm.c SRCS+= drm_module.c SRCS+= drm_sysfs.c COPTS.drm_crtc.c+= -Wno-shadow COPTS.drm_edid.c+= -Wno-shadow .include @ 1.2.4.1 log @file Makefile was added on branch rmind-smpnet on 2014-05-18 17:46:11 +0000 @ text @d1 57 @ 1.2.4.2 log @sync with head @ text @a0 57 # $NetBSD$ .include "../Makefile.inc" .include "Makefile.inc" .PATH: ${S}/external/bsd/drm2/drm .PATH: ${S}/external/bsd/drm2/pci .PATH: ${S}/external/bsd/drm2/dist/drm KMOD= drmkms IOCONF= drmkms.ioconf # Upstream source files. #SRCS+= ati_pcigart.c # Moved to drmkms_pci module. #SRCS+= drm_agpsupport.c # Moved to drmkms_pci module. SRCS+= drm_auth.c SRCS+= drm_buffer.c SRCS+= drm_bufs.c SRCS+= drm_cache.c SRCS+= drm_context.c SRCS+= drm_crtc.c SRCS+= drm_crtc_helper.c SRCS+= drm_dma.c SRCS+= drm_dp_helper.c SRCS+= drm_drv.c SRCS+= drm_edid.c #SRCS+= drm_encoder_slave.c # XXX Rewrite for i2c. SRCS+= drm_fb_helper.c # XXX Rewrite for wsconsole. SRCS+= drm_fops.c SRCS+= drm_gem.c SRCS+= drm_global.c SRCS+= drm_hashtab.c #SRCS+= drm_info.c # XXX Rewrite for sysctl or something. #SRCS+= drm_ioc32.c SRCS+= drm_ioctl.c SRCS+= drm_irq.c SRCS+= drm_lock.c SRCS+= drm_memory.c SRCS+= drm_mm.c SRCS+= drm_modes.c #SRCS+= drm_pci.c # Moved to drmkms_pci module. #SRCS+= drm_platform.c # XXX Rewrite per platform. #SRCS+= drm_prime.c # XXX Revisit later. #SRCS+= drm_proc.c # XXX Rewrite for sysctl. SRCS+= drm_scatter.c SRCS+= drm_stub.c SRCS+= drm_vm.c # NetBSD additions. SRCS+= drm_gem_vm.c SRCS+= drm_module.c SRCS+= drm_sysfs.c COPTS.drm_crtc.c+= -Wno-shadow COPTS.drm_edid.c+= -Wno-shadow .include @ 1.1 log @file Makefile was initially added on branch riastradh-drm2. @ text @d1 57 @ 1.1.2.1 log @Rework drm2 configuration and modularization. - Split drm2.kmod into drmkms_linux, drmkms, drmkms_pci. - Split up drmkms-related files.* similarly. - Make drm_agp_* routines hooks that the drmkms_pci module installs. - Reuse drm device major 180 for (old) drm and drmkms. Now old drm and new drmkms can coexist happily in the same tree, with or without PCI, and require no changes to userland. @ text @a0 57 # $NetBSD$ .include "../Makefile.inc" .include "Makefile.inc" .PATH: ${S}/external/bsd/drm2/drm .PATH: ${S}/external/bsd/drm2/pci .PATH: ${S}/external/bsd/drm2/dist/drm KMOD= drmkms IOCONF= drmkms.ioconf # Upstream source files. #SRCS+= ati_pcigart.c # Moved to drmkms_pci module. #SRCS+= drm_agpsupport.c # Moved to drmkms_pci module. SRCS+= drm_auth.c SRCS+= drm_buffer.c SRCS+= drm_bufs.c SRCS+= drm_cache.c SRCS+= drm_context.c SRCS+= drm_crtc.c SRCS+= drm_crtc_helper.c SRCS+= drm_dma.c SRCS+= drm_dp_helper.c SRCS+= drm_drv.c SRCS+= drm_edid.c #SRCS+= drm_encoder_slave.c # XXX Rewrite for i2c. SRCS+= drm_fb_helper.c # XXX Rewrite for wsconsole. SRCS+= drm_fops.c SRCS+= drm_gem.c SRCS+= drm_global.c SRCS+= drm_hashtab.c #SRCS+= drm_info.c # XXX Rewrite for sysctl or something. #SRCS+= drm_ioc32.c SRCS+= drm_ioctl.c SRCS+= drm_irq.c SRCS+= drm_lock.c SRCS+= drm_memory.c SRCS+= drm_mm.c SRCS+= drm_modes.c #SRCS+= drm_pci.c # Moved to drmkms_pci module. #SRCS+= drm_platform.c # XXX Rewrite per platform. #SRCS+= drm_prime.c # XXX Revisit later. #SRCS+= drm_proc.c # XXX Rewrite for sysctl. SRCS+= drm_scatter.c SRCS+= drm_stub.c SRCS+= drm_vm.c # NetBSD additions. SRCS+= drm_gem_vm.c SRCS+= drm_module.c SRCS+= drm_sysfs.c COPTS.drm_crtc.c+= -Wno-shadow COPTS.drm_edid.c+= -Wno-shadow .include @