Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/files/
Date: Sat, 19 Jun 2021 20:25:20
Message-Id: 1624134257.acb051ad8bd4c5e1f6b04a46e2392bf1e50b59be.gyakovlev@gentoo
1 commit: acb051ad8bd4c5e1f6b04a46e2392bf1e50b59be
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sat Jun 19 18:53:23 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 19 20:24:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acb051ad
7
8 sys-kernel/gentoo-kernel: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/21335
13 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
14
15 .../files/5.10.33-amdgpu-pagesz.patch | 50 ----------------------
16 1 file changed, 50 deletions(-)
17
18 diff --git a/sys-kernel/gentoo-kernel/files/5.10.33-amdgpu-pagesz.patch b/sys-kernel/gentoo-kernel/files/5.10.33-amdgpu-pagesz.patch
19 deleted file mode 100644
20 index 23185919326..00000000000
21 --- a/sys-kernel/gentoo-kernel/files/5.10.33-amdgpu-pagesz.patch
22 +++ /dev/null
23 @@ -1,50 +0,0 @@
24 -From 566c6e25f957ebdb0b6e8073ee291049118f47fb Mon Sep 17 00:00:00 2001
25 -From: Huacai Chen <chenhc@××××××.com>
26 -Date: Tue, 30 Mar 2021 23:33:33 +0800
27 -Subject: drm/amdgpu: Set a suitable dev_info.gart_page_size
28 -MIME-Version: 1.0
29 -Content-Type: text/plain; charset=UTF-8
30 -Content-Transfer-Encoding: 8bit
31 -
32 -In Mesa, dev_info.gart_page_size is used for alignment and it was
33 -set to AMDGPU_GPU_PAGE_SIZE(4KB). However, the page table of AMDGPU
34 -driver requires an alignment on CPU pages. So, for non-4KB page system,
35 -gart_page_size should be max_t(u32, PAGE_SIZE, AMDGPU_GPU_PAGE_SIZE).
36 -
37 -Signed-off-by: Rui Wang <wangr@××××××.com>
38 -Signed-off-by: Huacai Chen <chenhc@××××××.com>
39 -Link: https://github.com/loongson-community/linux-stable/commit/caa9c0a1
40 -[Xi: rebased for drm-next, use max_t for checkpatch,
41 - and reworded commit message.]
42 -[gyakovlev@g.o: backported to apply cleanly to 5.10.33]
43 -Signed-off-by: Xi Ruoyao <xry111@×××××××××××.wang>
44 -BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1549
45 -Tested-by: Dan Horák <dan@×××××.cz>
46 -Reviewed-by: Christian König <christian.koenig@×××.com>
47 -Signed-off-by: Alex Deucher <alexander.deucher@×××.com>
48 -Cc: stable@×××××××××××.org
49 ----
50 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
51 - 1 file changed, 2 insertions(+), 2 deletions(-)
52 -
53 -(limited to 'drivers/gpu/drm/amd/amdgpu')
54 -
55 -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
56 -index 64beb3399604..a4e2cf7cada1 100644
57 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
58 -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
59 -@@ -766,9 +766,9 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
60 - dev_info.high_va_offset = AMDGPU_GMC_HOLE_END;
61 - dev_info.high_va_max = AMDGPU_GMC_HOLE_END | vm_size;
62 - }
63 -- dev_info.virtual_address_alignment = max((int)PAGE_SIZE, AMDGPU_GPU_PAGE_SIZE);
64 -+ dev_info.virtual_address_alignment = max_t(u32, PAGE_SIZE, AMDGPU_GPU_PAGE_SIZE);
65 - dev_info.pte_fragment_size = (1 << adev->vm_manager.fragment_size) * AMDGPU_GPU_PAGE_SIZE;
66 -- dev_info.gart_page_size = AMDGPU_GPU_PAGE_SIZE;
67 -+ dev_info.gart_page_size = max_t(u32, PAGE_SIZE, AMDGPU_GPU_PAGE_SIZE);
68 - dev_info.cu_active_number = adev->gfx.cu_info.number;
69 - dev_info.cu_ao_mask = adev->gfx.cu_info.ao_cu_mask;
70 - dev_info.ce_ram_size = adev->gfx.ce_ram_size;
71 ---
72 -cgit v1.2.1
73 -