Skip to content

Commit

Permalink
MFH: r489050 r491609 r492864 r492896 r494747
Browse files Browse the repository at this point in the history 
This merges all changes done to drm-current-kmod, drm-fbsd12.0-kmod and
drm-fbsd11.2-kmod, in order to avoid merge conflicts.

Update pkg-descr to match reality

Update pkg-descr in drm-kmod ports to match reality in terms of which Linux
kernel version they correspond to and which FreeBSD version they are
supporting.

Noticed by:	Graham Perrin

graphics/drm-current-kmod: Update messges

Update pkg-message and makefile COMMENT to remove references to
drm-devel-kmod and the mention that this is the development version.  It is
the version for FreeBSD CURRENT, so the ride might be a little bumpy, but
it's not the devlopment version.

No changes to package.

FreeBSDDesktop issue:	#129

Reported by:	grahamperrin
Sponsored by:	B3 Init (zeising)

update drm-current and drm-fbsd12.0 snapshots

Update drm-current-kmod and drm-fbsd12.0-kmod to the latest snapshots.
This mutes console chatter about unimplemented stuff, which sometimes is
confusing.

Approved by:	jmd (maintainer, implicit)

graphics/drm-fbsd{11.2,12.0}-kmod: Update pkg-message with new names

PR:		235726
Approved by:	graphics (jmd)
Differential Revision:	https://reviews.freebsd.org/D19189

Update drm kmods for current and FreeBSD 12.0

Update graphics/drm-current-kmod and graphics/drm-fbsd12.0-kmod to their
respective latest snapshots.

This fixes a bug where a non-recursive mutex was used recursively in certain
conditions.
See FreeBSDDesktop/kms-drm#134 for further details

FreeBSDDesktop issue:	#134
Approved by:		jmd (maintainer, implicit)
Sponsored by:		B3 Init

Approved by:	ports-secteam (implicit, drm-kmod ports)
  • Loading branch information
@zeising
zeising committed Mar 5, 2019
1 parent ec50673 commit df173a8
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 27 deletions.
6 changes: 3 additions & 3 deletions graphics/drm-current-kmod/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
# $FreeBSD$

PORTNAME= drm-current-kmod
PORTVERSION= 4.16.g20181210
PORTVERSION= 4.16.g20190305
CATEGORIES= graphics kld

MAINTAINER= jmd@FreeBSD.org
COMMENT= DRM modules for the linuxkpi-based KMS components (development version)
COMMENT= DRM modules for the linuxkpi-based KMS components

LICENSE= BSD2CLAUSE MIT GPLv2
LICENSE_COMB= multi
Expand All @@ -25,7 +25,7 @@ USES= kmod uidfix compiler:c++11-lang
USE_GITHUB= yes
GH_ACCOUNT= FreeBSDDesktop
GH_PROJECT= kms-drm
GH_TAGNAME= b5ef47b
GH_TAGNAME= 78e51d0

.include <bsd.port.options.mk>

Expand Down
6 changes: 3 additions & 3 deletions graphics/drm-current-kmod/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1544500865
SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181210-b5ef47b_GH0.tar.gz) = 00e9204d48e4f72fb20587135cfe6ecb5719aa8c77274d44f77036073ecbe3e7
SIZE (FreeBSDDesktop-kms-drm-4.16.g20181210-b5ef47b_GH0.tar.gz) = 13089381
TIMESTAMP = 1551820688
SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190305-78e51d0_GH0.tar.gz) = 79f716f59825235476fb9a0416244c9b97872ce68ee30ad716e720505df21feb
SIZE (FreeBSDDesktop-kms-drm-4.16.g20190305-78e51d0_GH0.tar.gz) = 13088998
3 changes: 2 additions & 1 deletion graphics/drm-current-kmod/pkg-descr
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
Currently corresponding to Linux 4.16 DRM. This is the development version.
Currently corresponding to Linux 4.16 DRM.
This version is for FreeBSD CURRENT.
amdgpu and radeonkms are known to fail with EFI boot.

WWW: https://github.com/FreeBSDDesktop/kms-drm
2 changes: 1 addition & 1 deletion graphics/drm-current-kmod/pkg-message
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The experimental drm-devel-kmod port can be enabled for amdgpu (for AMD
The experimental drm-current-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
Expand Down
5 changes: 3 additions & 2 deletions graphics/drm-fbsd11.2-kmod/pkg-descr
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
Currently corresponding to Linux 4.9 DRM. More stable state. amdgpu and
radeonkms are known to fail with EFI boot.
Currently corresponding to Linux 4.11 DRM.
This version is for FreeBSD 11.2.
amdgpu and radeonkms are known to fail with EFI boot.

WWW: https://github.com/FreeBSDDesktop/kms-drm
10 changes: 5 additions & 5 deletions graphics/drm-fbsd11.2-kmod/pkg-message
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
The drm-stable-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).
The drm-fbsd11.2-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"
Expand Down
4 changes: 2 additions & 2 deletions graphics/drm-fbsd12.0-kmod/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= drm-fbsd12.0-kmod
PORTVERSION= 4.16.g20181215
PORTVERSION= 4.16.g20190305
CATEGORIES= graphics

MAINTAINER= jmd@FreeBSD.org
Expand All @@ -25,7 +25,7 @@ USES= kmod uidfix compiler:c++11-lang
USE_GITHUB= yes
GH_ACCOUNT= FreeBSDDesktop
GH_PROJECT= kms-drm
GH_TAGNAME= 71fcc9f
GH_TAGNAME= 4192575

.include <bsd.port.options.mk>

Expand Down
6 changes: 3 additions & 3 deletions graphics/drm-fbsd12.0-kmod/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1544863688
SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181215-71fcc9f_GH0.tar.gz) = b969611bbdac88394e5e5be4284ceea048425b994d872651d801baf41263c0e7
SIZE (FreeBSDDesktop-kms-drm-4.16.g20181215-71fcc9f_GH0.tar.gz) = 13088892
TIMESTAMP = 1551820854
SHA256 (FreeBSDDesktop-kms-drm-4.16.g20190305-4192575_GH0.tar.gz) = a0115ebf3d3ec15ad7d4580ec73f51b485b53550f1a670a35bf10621702eec27
SIZE (FreeBSDDesktop-kms-drm-4.16.g20190305-4192575_GH0.tar.gz) = 13088998
5 changes: 3 additions & 2 deletions graphics/drm-fbsd12.0-kmod/pkg-descr
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
Currently corresponding to Linux 4.11 DRM. Experimental state. amdgpu and
radeonkms are known to fail with EFI boot.
Currently corresponding to Linux 4.16 DRM.
This version is for FreeBSD 12.0.
amdgpu and radeonkms are known to fail with EFI boot.

WWW: https://github.com/FreeBSDDesktop/kms-drm
10 changes: 5 additions & 5 deletions graphics/drm-fbsd12.0-kmod/pkg-message
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
The drm-next-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).
The drm-fbsd12.0-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"
Expand Down

0 comments on commit df173a8

Please sign in to comment.