Skip to content

Instantly share code, notes, and snippets.

@johalun

johalun/drm.diff

Created May 25, 2019 19:55
Show Gist options
  • Save johalun/2b7aa09298d0e000c84fca14adbdff18 to your computer and use it in GitHub Desktop.
Save johalun/2b7aa09298d0e000c84fca14adbdff18 to your computer and use it in GitHub Desktop.
Download ZIP
drm update
Raw
drm.diff
diff --git a/graphics/drm-current-kmod/Makefile b/graphics/drm-current-kmod/Makefile
index a026dfa03c86..e5f3f8103d22 100644
--- a/graphics/drm-current-kmod/Makefile
+++ b/graphics/drm-current-kmod/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
CONFLICTS_INSTALL= drm-devel-kmod \
drm-fbsd11.2-kmod \
drm-fbsd12.0-kmod \
+ drm-fbsd12.1-kmod \
drm-legacy-kmod
OPTIONS_DEFINE= DEBUG
diff --git a/graphics/drm-devel-kmod/Makefile b/graphics/drm-devel-kmod/Makefile
index 639d23b39de6..accf46830885 100644
--- a/graphics/drm-devel-kmod/Makefile
+++ b/graphics/drm-devel-kmod/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
CONFLICTS_INSTALL= drm-current-kmod \
drm-fbsd11.2-kmod \
drm-fbsd12.0-kmod \
+ drm-fbsd12.1-kmod \
drm-legacy-kmod
OPTIONS_DEFINE= DEBUG
diff --git a/graphics/drm-fbsd11.2-kmod/Makefile b/graphics/drm-fbsd11.2-kmod/Makefile
index a727b5ce6d6c..f7f58fb327c2 100644
--- a/graphics/drm-fbsd11.2-kmod/Makefile
+++ b/graphics/drm-fbsd11.2-kmod/Makefile
@@ -18,6 +18,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
CONFLICTS_INSTALL= drm-devel-kmod \
drm-fbsd12.0-kmod \
+ drm-fbsd12.1-kmod \
drm-current-kmod \
drm-legacy-kmod
diff --git a/graphics/drm-fbsd12.0-kmod/Makefile b/graphics/drm-fbsd12.0-kmod/Makefile
index a992d9110d11..e6695e9ae6e0 100644
--- a/graphics/drm-fbsd12.0-kmod/Makefile
+++ b/graphics/drm-fbsd12.0-kmod/Makefile
@@ -18,6 +18,7 @@ RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
CONFLICTS_INSTALL= drm-devel-kmod \
drm-fbsd11.2-kmod \
+ drm-fbsd12.1-kmod \
drm-current-kmod \
drm-legacy-kmod
diff --git a/graphics/drm-fbsd12.1-kmod/Makefile b/graphics/drm-fbsd12.1-kmod/Makefile
new file mode 100644
index 000000000000..8f20e9d0818e
--- /dev/null
+++ b/graphics/drm-fbsd12.1-kmod/Makefile
@@ -0,0 +1,65 @@
+# Created by: Johannes Dieterich <[email protected]>
+# $FreeBSD$
+
+PORTNAME= drm-fbsd12.1-kmod
+PORTVERSION= 4.16.g20190525
+CATEGORIES= graphics
+
+MAINTAINER= [email protected]
+COMMENT= DRM modules for the linuxkpi-based KMS components
+
+LICENSE= BSD2CLAUSE MIT GPLv2
+LICENSE_COMB= multi
+
+ONLY_FOR_ARCHS= amd64 i386
+ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64 and i386
+
+RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod
+
+CONFLICTS_INSTALL= drm-devel-kmod \
+ drm-fbsd11.2-kmod \
+ drm-fbsd12.0-kmod \
+ drm-current-kmod \
+ drm-legacy-kmod
+
+OPTIONS_DEFINE= DEBUG
+
+USES= kmod uidfix compiler:c++11-lang
+
+USE_GITHUB= yes
+GH_ACCOUNT= FreeBSDDesktop
+GH_PROJECT= kms-drm
+GH_TAGNAME= b890994
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200514
+IGNORE= only supported on FreeBSD 12.1 and later
+.endif
+.if ${OPSYS} != FreeBSD
+IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality)
+.endif
+
+.if ${ARCH} == "amd64"
+PLIST_SUB+= AMDGPU=""
+PLIST_SUB+= AMDKFD=""
+PLIST_SUB+= I915=""
+PLIST_SUB+= VMWGFX=""
+.elif ${ARCH} == "i386"
+PLIST_SUB+= AMDGPU="@comment "
+PLIST_SUB+= AMDKFD="@comment "
+PLIST_SUB+= I915=""
+PLIST_SUB+= VMWGFX=""
+.elif ${ARCH} == "powerpc64"
+PLIST_SUB+= AMDGPU=""
+PLIST_SUB+= AMDKFD="@comment "
+PLIST_SUB+= I915="@comment "
+PLIST_SUB+= VMWGFX="@comment "
+.else
+PLIST_SUB+= AMDGPU="@comment "
+PLIST_SUB+= AMDKFD="@comment "
+PLIST_SUB+= I915="@comment "
+PLIST_SUB+= VMWGFX="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/graphics/drm-fbsd12.1-kmod/distinfo b/graphics/drm-fbsd12.1-kmod/distinfo
new file mode 100644
index 000000000000..8bc6cbd073f0
--- /dev/null
+++ b/graphics/drm-fbsd12.1-kmod/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1558813841
+SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190525-b890994_GH0.tar.gz) = 3292e6e795df47d077784e0e84aa7d774ad030e78da0a3913889ae5f4c8cda29
+SIZE (FreeBSDDesktop-kms-drm-4.16.g20190525-b890994_GH0.tar.gz) = 13089654
diff --git a/graphics/drm-fbsd12.1-kmod/pkg-descr b/graphics/drm-fbsd12.1-kmod/pkg-descr
new file mode 100644
index 000000000000..9665d220af1b
--- /dev/null
+++ b/graphics/drm-fbsd12.1-kmod/pkg-descr
@@ -0,0 +1,6 @@
+amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
+Currently corresponding to Linux 4.16 DRM.
+This version is for FreeBSD 12.1.
+amdgpu and radeonkms are known to fail with EFI boot.
+
+WWW: https://github.com/FreeBSDDesktop/kms-drm
diff --git a/graphics/drm-fbsd12.1-kmod/pkg-message b/graphics/drm-fbsd12.1-kmod/pkg-message
new file mode 100644
index 000000000000..1658df629c35
--- /dev/null
+++ b/graphics/drm-fbsd12.1-kmod/pkg-message
@@ -0,0 +1,15 @@
+The drm-fbsd12.1-kmod port can be enabled for amdgpu (for AMD GPUs starting
+with the HD7000 series / Tahiti) or i915kms (for Intel APUs starting with
+HD3000 / Sandy Bridge) through kld_list in /etc/rc.conf. radeonkms for older
+AMD GPUs can be loaded and there are some positive reports if EFI boot is NOT
+enabled (similar to amdgpu).
+
+For amdgpu: kld_list="amdgpu"
+For Intel: kld_list="/boot/modules/i915kms.ko"
+For radeonkms: kld_list="/boot/modules/radeonkms.ko"
+
+Please ensure that all users requiring graphics are members of the
+"video" group.
+
+Older generations are supported by the legacy kms modules (radeonkms /
+i915kms) in base or by installing graphics/drm-legacy-kmod.
diff --git a/graphics/drm-fbsd12.1-kmod/pkg-plist b/graphics/drm-fbsd12.1-kmod/pkg-plist
new file mode 100644
index 000000000000..d58a2084b1f2
--- /dev/null
+++ b/graphics/drm-fbsd12.1-kmod/pkg-plist
@@ -0,0 +1,8 @@
+%%AMDGPU%%/%%KMODDIR%%/amdgpu.ko
+%%AMDKFD%%/%%KMODDIR%%/amdkfd.ko
+/%%KMODDIR%%/drm.ko
+%%I915%%/%%KMODDIR%%/i915kms.ko
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200514
+IGNORE= only supported on FreeBSD 12.1 and later
+.endif
+.if ${OPSYS} != FreeBSD
+IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality)
+.endif
+
+.if ${ARCH} == "amd64"
+PLIST_SUB+= AMDGPU=""
+PLIST_SUB+= AMDKFD=""
+PLIST_SUB+= I915=""
+PLIST_SUB+= VMWGFX=""
+.elif ${ARCH} == "i386"
+PLIST_SUB+= AMDGPU="@comment "
+PLIST_SUB+= AMDKFD="@comment "
+PLIST_SUB+= I915=""
+PLIST_SUB+= VMWGFX=""
+.elif ${ARCH} == "powerpc64"
+PLIST_SUB+= AMDGPU=""
+PLIST_SUB+= AMDKFD="@comment "
+PLIST_SUB+= I915="@comment "
+PLIST_SUB+= VMWGFX="@comment "
+.else
+PLIST_SUB+= AMDGPU="@comment "
+PLIST_SUB+= AMDKFD="@comment "
+PLIST_SUB+= I915="@comment "
+PLIST_SUB+= VMWGFX="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/graphics/drm-fbsd12.1-kmod/distinfo b/graphics/drm-fbsd12.1-kmod/distinfo
new file mode 100644
index 000000000000..8bc6cbd073f0
--- /dev/null
+++ b/graphics/drm-fbsd12.1-kmod/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1558813841
+SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190525-b890994_GH0.tar.gz) = 3292e6e795df47d077784e0e84aa7d774ad030e78da0a3913889ae5f4c8cda29
+SIZE (FreeBSDDesktop-kms-drm-4.16.g20190525-b890994_GH0.tar.gz) = 13089654
diff --git a/graphics/drm-fbsd12.1-kmod/pkg-descr b/graphics/drm-fbsd12.1-kmod/pkg-descr
new file mode 100644
index 000000000000..9665d220af1b
--- /dev/null
+++ b/graphics/drm-fbsd12.1-kmod/pkg-descr
@@ -0,0 +1,6 @@
+amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
+Currently corresponding to Linux 4.16 DRM.
+This version is for FreeBSD 12.1.
+amdgpu and radeonkms are known to fail with EFI boot.
+
+WWW: https://github.com/FreeBSDDesktop/kms-drm
diff --git a/graphics/drm-fbsd12.1-kmod/pkg-message b/graphics/drm-fbsd12.1-kmod/pkg-message
new file mode 100644
index 000000000000..1658df629c35
--- /dev/null
+++ b/graphics/drm-fbsd12.1-kmod/pkg-message
@@ -0,0 +1,15 @@
+The drm-fbsd12.1-kmod port can be enabled for amdgpu (for AMD GPUs starting
+with the HD7000 series / Tahiti) or i915kms (for Intel APUs starting with
+HD3000 / Sandy Bridge) through kld_list in /etc/rc.conf. radeonkms for older
+AMD GPUs can be loaded and there are some positive reports if EFI boot is NOT
+enabled (similar to amdgpu).
+
+For amdgpu: kld_list="amdgpu"
+For Intel: kld_list="/boot/modules/i915kms.ko"
+For radeonkms: kld_list="/boot/modules/radeonkms.ko"
+
+Please ensure that all users requiring graphics are members of the
+"video" group.
+
+Older generations are supported by the legacy kms modules (radeonkms /
+i915kms) in base or by installing graphics/drm-legacy-kmod.
diff --git a/graphics/drm-fbsd12.1-kmod/pkg-plist b/graphics/drm-fbsd12.1-kmod/pkg-plist
new file mode 100644
index 000000000000..d58a2084b1f2
--- /dev/null
+++ b/graphics/drm-fbsd12.1-kmod/pkg-plist
@@ -0,0 +1,8 @@
+%%AMDGPU%%/%%KMODDIR%%/amdgpu.ko
+%%AMDKFD%%/%%KMODDIR%%/amdkfd.ko
+/%%KMODDIR%%/drm.ko
+%%I915%%/%%KMODDIR%%/i915kms.ko
+/%%KMODDIR%%/linuxkpi_gplv2.ko
+/%%KMODDIR%%/radeonkms.ko
+/%%KMODDIR%%/ttm.ko
+%%VMWGFX%%/%%KMODDIR%%/vmwgfx.ko
diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile
index b66341c6fb7e..a6cd0113b51a 100644
--- a/graphics/drm-kmod/Makefile
+++ b/graphics/drm-kmod/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= drm-kmod
-PORTVERSION= g20181126
+PORTVERSION= g20190525
CATEGORIES= graphics
MAINTAINER= [email protected]
@@ -28,8 +28,10 @@ RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
IGNORE= not supported on older 12, no kernel support
.elif ${OSVERSION} >= 1200045 && ${OSVERSION} < 1200058
RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd11.2-kmod
-.elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1300000
+.elif ${OSVERSION} >= 1200058 && ${OSVERSION} < 1200514
RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod
+.elif ${OSVERSION} >= 1200514 && ${OSVERSION} < 1300000
+RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.1-kmod
.elif ${OSVERSION} >= 1300000
RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-current-kmod
.else
diff --git a/graphics/drm-legacy-kmod/Makefile b/graphics/drm-legacy-kmod/Makefile
index ddf076c860dc..724a2efac2ee 100644
--- a/graphics/drm-legacy-kmod/Makefile
+++ b/graphics/drm-legacy-kmod/Makefile
@@ -22,6 +22,7 @@ OPTIONS_DEFINE= DEBUG
CONFLICTS_INSTALL= drm-devel-kmod \
drm-fbsd11.2-kmod \
drm-fbsd12.0-kmod \
+ drm-fbsd12.1-kmod \
drm-current-kmod
USE_GITHUB= yes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment