Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] linux5.x: Enable DRM_AMDGPU_USERPTR and HMM_MIRROR
@ 2020-04-18 11:38 ahesford
  2020-04-18 11:42 ` xtraeme
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: ahesford @ 2020-04-18 11:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1020 bytes --]

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages linux
https://github.com/void-linux/void-packages/pull/21121

linux5.x: Enable DRM_AMDGPU_USERPTR and HMM_MIRROR
`DRM_AMDGPU_USERPTR` is enabled in all Void kernel configs for `i686` and `x86_64` in Linux 4.x, but not in 5.x. The `*_USERPTR` options are enabled in 5.x for the `i915` and `radeon` drivers.
The `HMM_MIRROR` option in Linux 5.x is selected when enabling `DRM_AMDGPU_USERPTR`, so this option comes along for the ride.

Both options will be required to support some AMD ROCm packages I'm hoping to prepare and submit in the near future.

These options are currently enabled for `ppc64*` across all versions of the kernel in packaged in Void, so these changes also improve consistency of configurations.

Travis will absolutely timeout building these kernels, so I'm skipping CI.

A patch file from https://github.com/void-linux/void-packages/pull/21121.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux-21121.patch --]
[-- Type: text/x-diff, Size: 6009 bytes --]

From 5b8d9c8023728a7868b7d967c43961f386643cd1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 17 Apr 2020 21:23:28 -0400
Subject: [PATCH 1/3] linux5.4: enable DRM_AMDGPU_USERPTR and HMM_MIRROR

---
 srcpkgs/linux5.4/files/i386-dotconfig   | 3 ++-
 srcpkgs/linux5.4/files/x86_64-dotconfig | 3 ++-
 srcpkgs/linux5.4/template               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig
index b6a86b95853..5bf230babad 100644
--- a/srcpkgs/linux5.4/files/i386-dotconfig
+++ b/srcpkgs/linux5.4/files/i386-dotconfig
@@ -942,6 +942,7 @@ CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_HMM_MIRROR=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
@@ -5640,7 +5641,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_USERPTR is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig
index 7ce91e7c6cc..5e240834a8b 100644
--- a/srcpkgs/linux5.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.4/files/x86_64-dotconfig
@@ -985,6 +985,7 @@ CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DEVICE=y
 CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
 # CONFIG_DEVICE_PRIVATE is not set
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
@@ -5705,7 +5706,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_USERPTR is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index e2edc61d150..d7097c63e20 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.4'
 pkgname=linux5.4
 version=5.4.33
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"

From 06345be8b290281965a8170e18271934d10134bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 17 Apr 2020 21:23:29 -0400
Subject: [PATCH 2/3] linux5.5: enable DRM_AMDGPU_USERPTR and HMM_MIRROR

---
 srcpkgs/linux5.5/files/i386-dotconfig   | 3 ++-
 srcpkgs/linux5.5/files/x86_64-dotconfig | 3 ++-
 srcpkgs/linux5.5/template               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.5/files/i386-dotconfig b/srcpkgs/linux5.5/files/i386-dotconfig
index d8042b4b223..1539171297b 100644
--- a/srcpkgs/linux5.5/files/i386-dotconfig
+++ b/srcpkgs/linux5.5/files/i386-dotconfig
@@ -944,6 +944,7 @@ CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_HMM_MIRROR=y
 CONFIG_FRAME_VECTOR=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
@@ -5630,7 +5631,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_USERPTR is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
diff --git a/srcpkgs/linux5.5/files/x86_64-dotconfig b/srcpkgs/linux5.5/files/x86_64-dotconfig
index aed66bd131c..22a9cb276d1 100644
--- a/srcpkgs/linux5.5/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.5/files/x86_64-dotconfig
@@ -983,6 +983,7 @@ CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DEVICE=y
 CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
 # CONFIG_DEVICE_PRIVATE is not set
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
@@ -5680,7 +5681,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_USERPTR is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
diff --git a/srcpkgs/linux5.5/template b/srcpkgs/linux5.5/template
index 47e823c30ad..09a9a5ca946 100644
--- a/srcpkgs/linux5.5/template
+++ b/srcpkgs/linux5.5/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.5'
 pkgname=linux5.5
 version=5.5.16
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Juan RP <xtraeme@gmail.com>"

From dadc20ce6a5f779e051a904ea1a4234ce8ae8b0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 17 Apr 2020 21:23:31 -0400
Subject: [PATCH 3/3] linux5.6: enable DRM_AMDGPU_USERPTR and HMM_MIRROR [ci
 skip]

---
 srcpkgs/linux5.6/files/x86_64-dotconfig | 3 ++-
 srcpkgs/linux5.6/template               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.6/files/x86_64-dotconfig b/srcpkgs/linux5.6/files/x86_64-dotconfig
index 73e10dd06f3..bba42a98255 100644
--- a/srcpkgs/linux5.6/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.6/files/x86_64-dotconfig
@@ -990,6 +990,7 @@ CONFIG_IDLE_PAGE_TRACKING=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
 CONFIG_ZONE_DEVICE=y
 CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
 # CONFIG_DEVICE_PRIVATE is not set
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
@@ -5710,7 +5711,7 @@ CONFIG_DRM_RADEON_USERPTR=y
 CONFIG_DRM_AMDGPU=m
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_CIK=y
-# CONFIG_DRM_AMDGPU_USERPTR is not set
+CONFIG_DRM_AMDGPU_USERPTR=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
diff --git a/srcpkgs/linux5.6/template b/srcpkgs/linux5.6/template
index cfaeace3436..f29a328a2ff 100644
--- a/srcpkgs/linux5.6/template
+++ b/srcpkgs/linux5.6/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.6'
 pkgname=linux5.6
 version=5.6.5
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Juan RP <xtraeme@gmail.com>"

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-04-18 14:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-18 11:38 [PR PATCH] linux5.x: Enable DRM_AMDGPU_USERPTR and HMM_MIRROR ahesford
2020-04-18 11:42 ` xtraeme
2020-04-18 14:29 ` [PR PATCH] [Updated] " ahesford
2020-04-18 14:30 ` ahesford
2020-04-18 14:32 ` xtraeme
2020-04-18 14:32 ` [PR PATCH] [Merged]: " xtraeme

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).