Attachment #227137 for bug #257786

Lines 1-7 Link Here

(-)b/graphics/gpu-firmware-kmod/Makefile (-3 / +3 lines)
1	# Created by: Johannes Dieterich <jmd@FreeBSD.org>	1	# Created by: Johannes Dieterich <jmd@FreeBSD.org>
2		2
3	PORTNAME= gpu-firmware-kmod	3	PORTNAME= gpu-firmware-kmod
4	PORTVERSION= g20210330	4	PORTVERSION= g20210812
5	CATEGORIES= graphics	5	CATEGORIES= graphics
6		6
7	MAINTAINER= jmd@FreeBSD.org	7	MAINTAINER= jmd@FreeBSD.org
Lines 19-26 LICENSE_PERMS_INTEL= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept Link Here
19	USES= kmod uidfix	19	USES= kmod uidfix
20		20
21	USE_GITHUB= yes	21	USE_GITHUB= yes
22	GH_ACCOUNT= freebsd	22	GH_ACCOUNT= juikim
23	GH_PROJECT= drm-kmod-firmware	23	GH_PROJECT= drm-kmod-firmware
24	GH_TAGNAME= df9e66d	24	GH_TAGNAME= 17c76f1
25		25
26	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/graphics/gpu-firmware-kmod/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1617128641	1	TIMESTAMP = 1628789702
2	SHA256 (freebsd-drm-kmod-firmware-g20210330-df9e66d_GH0.tar.gz) = 88540f1b7ec435be31110a0ce21e1f9a1aa96bad2c4ac300409d01b7a154fa35	2	SHA256 (juikim-drm-kmod-firmware-g20210812-17c76f1_GH0.tar.gz) = 97cb5b63af796e12b35c8bfcc3a09d0ab458a250197f3dceb98696e4a269c5af
3	SIZE (freebsd-drm-kmod-firmware-g20210330-df9e66d_GH0.tar.gz) = 27703662	3	SIZE (juikim-drm-kmod-firmware-g20210812-17c76f1_GH0.tar.gz) = 23942068




--- amdgpukmsfw/Makefile.orig	2021-03-30 18:15:09 UTC
+++ amdgpukmsfw/Makefile
@@ -36,17 +36,6 @@ SUBDIR=									\
 	fiji_smc							\
 	fiji_uvd							\
 	fiji_vce							\
-	green_sardine_asd						\
-	green_sardine_ce						\
-	green_sardine_dmcub						\
-	green_sardine_me						\
-	green_sardine_mec						\
-	green_sardine_mec2						\
-	green_sardine_pfp						\
-	green_sardine_rlc						\
-	green_sardine_sdma						\
-	green_sardine_ta						\
-	green_sardine_vcn						\
 	hainan_ce							\
 	hainan_k_smc							\
 	hainan_mc							\
@@ -142,18 +131,6 @@ SUBDIR=									\
 	navi14_sos							\
 	navi14_ta							\
 	navi14_vcn							\
-	navy_flounder_ce						\
-	navy_flounder_dmcub						\
-	navy_flounder_me						\
-	navy_flounder_mec						\
-	navy_flounder_mec2						\
-	navy_flounder_pfp						\
-	navy_flounder_rlc						\
-	navy_flounder_sdma						\
-	navy_flounder_smc						\
-	navy_flounder_sos						\
-	navy_flounder_ta						\
-	navy_flounder_vcn						\
 	oland_ce							\
 	oland_k_smc							\
 	oland_mc							\
@@ -280,18 +257,6 @@ SUBDIR=									\
 	renoir_ta							\
 	renoir_vcn							\
 	si58_mc								\
-	sienna_cichlid_ce						\
-	sienna_cichlid_dmcub						\
-	sienna_cichlid_me						\
-	sienna_cichlid_mec						\
-	sienna_cichlid_mec2						\
-	sienna_cichlid_pfp						\
-	sienna_cichlid_rlc						\
-	sienna_cichlid_sdma						\
-	sienna_cichlid_smc						\
-	sienna_cichlid_sos						\
-	sienna_cichlid_ta						\
-	sienna_cichlid_vcn						\
 	stoney_ce							\
 	stoney_me							\
 	stoney_mec							\




/%%KMODDIR%%/amdgpu_arcturus_asd_bin.ko
/%%KMODDIR%%/amdgpu_arcturus_gpu_info_bin.ko
/%%KMODDIR%%/amdgpu_arcturus_mec_bin.ko
/%%KMODDIR%%/amdgpu_arcturus_mec2_bin.ko
/%%KMODDIR%%/amdgpu_arcturus_rlc_bin.ko
/%%KMODDIR%%/amdgpu_arcturus_sdma_bin.ko
/%%KMODDIR%%/amdgpu_arcturus_smc_bin.ko
/%%KMODDIR%%/amdgpu_arcturus_sos_bin.ko
/%%KMODDIR%%/amdgpu_arcturus_ta_bin.ko
/%%KMODDIR%%/amdgpu_arcturus_vcn_bin.ko
/%%KMODDIR%%/amdgpu_banks_k_2_smc_bin.ko
/%%KMODDIR%%/amdgpu_bonaire_ce_bin.ko
/%%KMODDIR%%/amdgpu_bonaire_k_smc_bin.ko

/%%KMODDIR%%/amdgpu_polaris11_smc_sk_bin.ko
/%%KMODDIR%%/amdgpu_polaris11_uvd_bin.ko
/%%KMODDIR%%/amdgpu_polaris11_vce_bin.ko
/%%KMODDIR%%/amdgpu_polaris12_32_mc_bin.ko
/%%KMODDIR%%/amdgpu_polaris12_ce_2_bin.ko
/%%KMODDIR%%/amdgpu_polaris12_ce_bin.ko
/%%KMODDIR%%/amdgpu_polaris12_k_mc_bin.ko

Return to bug 257786

Removed Link Here

(-)a/graphics/gpu-firmware-kmod/files/patch-amdgpukmsfw_Makefile (-58 lines)
1	--- amdgpukmsfw/Makefile.orig 2021-03-30 18:15:09 UTC
2	+++ amdgpukmsfw/Makefile
3	@@ -36,17 +36,6 @@ SUBDIR= \
4	fiji_smc \
5	fiji_uvd \
6	fiji_vce \
7	- green_sardine_asd \
8	- green_sardine_ce \
9	- green_sardine_dmcub \
10	- green_sardine_me \
11	- green_sardine_mec \
12	- green_sardine_mec2 \
13	- green_sardine_pfp \
14	- green_sardine_rlc \
15	- green_sardine_sdma \
16	- green_sardine_ta \
17	- green_sardine_vcn \
18	hainan_ce \
19	hainan_k_smc \
20	hainan_mc \
21	@@ -142,18 +131,6 @@ SUBDIR= \
22	navi14_sos \
23	navi14_ta \
24	navi14_vcn \
25	- navy_flounder_ce \
26	- navy_flounder_dmcub \
27	- navy_flounder_me \
28	- navy_flounder_mec \
29	- navy_flounder_mec2 \
30	- navy_flounder_pfp \
31	- navy_flounder_rlc \
32	- navy_flounder_sdma \
33	- navy_flounder_smc \
34	- navy_flounder_sos \
35	- navy_flounder_ta \
36	- navy_flounder_vcn \
37	oland_ce \
38	oland_k_smc \
39	oland_mc \
40	@@ -280,18 +257,6 @@ SUBDIR= \
41	renoir_ta \
42	renoir_vcn \
43	si58_mc \
44	- sienna_cichlid_ce \
45	- sienna_cichlid_dmcub \
46	- sienna_cichlid_me \
47	- sienna_cichlid_mec \
48	- sienna_cichlid_mec2 \
49	- sienna_cichlid_pfp \
50	- sienna_cichlid_rlc \
51	- sienna_cichlid_sdma \
52	- sienna_cichlid_smc \
53	- sienna_cichlid_sos \
54	- sienna_cichlid_ta \
55	- sienna_cichlid_vcn \
56	stoney_ce \
57	stoney_me \
58	stoney_mec \

Lines 1-3 Link Here

(-)b/graphics/gpu-firmware-kmod/pkg-plist (+11 lines)
		1	/%%KMODDIR%%/amdgpu_arcturus_asd_bin.ko
		2	/%%KMODDIR%%/amdgpu_arcturus_gpu_info_bin.ko
		3	/%%KMODDIR%%/amdgpu_arcturus_mec_bin.ko
		4	/%%KMODDIR%%/amdgpu_arcturus_mec2_bin.ko
		5	/%%KMODDIR%%/amdgpu_arcturus_rlc_bin.ko
		6	/%%KMODDIR%%/amdgpu_arcturus_sdma_bin.ko
		7	/%%KMODDIR%%/amdgpu_arcturus_smc_bin.ko
		8	/%%KMODDIR%%/amdgpu_arcturus_sos_bin.ko
		9	/%%KMODDIR%%/amdgpu_arcturus_ta_bin.ko
		10	/%%KMODDIR%%/amdgpu_arcturus_vcn_bin.ko
1	/%%KMODDIR%%/amdgpu_banks_k_2_smc_bin.ko	11	/%%KMODDIR%%/amdgpu_banks_k_2_smc_bin.ko
2	/%%KMODDIR%%/amdgpu_bonaire_ce_bin.ko	12	/%%KMODDIR%%/amdgpu_bonaire_ce_bin.ko
3	/%%KMODDIR%%/amdgpu_bonaire_k_smc_bin.ko	13	/%%KMODDIR%%/amdgpu_bonaire_k_smc_bin.ko
Lines 198-203 Link Here
198	/%%KMODDIR%%/amdgpu_polaris11_smc_sk_bin.ko	208	/%%KMODDIR%%/amdgpu_polaris11_smc_sk_bin.ko
199	/%%KMODDIR%%/amdgpu_polaris11_uvd_bin.ko	209	/%%KMODDIR%%/amdgpu_polaris11_uvd_bin.ko
200	/%%KMODDIR%%/amdgpu_polaris11_vce_bin.ko	210	/%%KMODDIR%%/amdgpu_polaris11_vce_bin.ko
		211	/%%KMODDIR%%/amdgpu_polaris12_32_mc_bin.ko
201	/%%KMODDIR%%/amdgpu_polaris12_ce_2_bin.ko	212	/%%KMODDIR%%/amdgpu_polaris12_ce_2_bin.ko
202	/%%KMODDIR%%/amdgpu_polaris12_ce_bin.ko	213	/%%KMODDIR%%/amdgpu_polaris12_ce_bin.ko
203	/%%KMODDIR%%/amdgpu_polaris12_k_mc_bin.ko	214	/%%KMODDIR%%/amdgpu_polaris12_k_mc_bin.ko