Commit 296bb163 authored by Alex Deucher's avatar Alex Deucher

Revert "drm/amdgpu: use HMM callback to replace mmu notifier"

This reverts commit 57731a07.

This depends on an HMM fix which is not upstream yet.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 20d05927
...@@ -26,10 +26,10 @@ config DRM_AMDGPU_CIK ...@@ -26,10 +26,10 @@ config DRM_AMDGPU_CIK
config DRM_AMDGPU_USERPTR config DRM_AMDGPU_USERPTR
bool "Always enable userptr write support" bool "Always enable userptr write support"
depends on DRM_AMDGPU depends on DRM_AMDGPU
select HMM_MIRROR select MMU_NOTIFIER
help help
This option selects CONFIG_HMM and CONFIG_HMM_MIRROR if it This option selects CONFIG_MMU_NOTIFIER if it isn't already
isn't already selected to enabled full userptr support. selected to enabled full userptr support.
config DRM_AMDGPU_GART_DEBUGFS config DRM_AMDGPU_GART_DEBUGFS
bool "Allow GART access through debugfs" bool "Allow GART access through debugfs"
......
...@@ -173,7 +173,7 @@ endif ...@@ -173,7 +173,7 @@ endif
amdgpu-$(CONFIG_COMPAT) += amdgpu_ioc32.o amdgpu-$(CONFIG_COMPAT) += amdgpu_ioc32.o
amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o
amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o
amdgpu-$(CONFIG_HMM_MIRROR) += amdgpu_mn.o amdgpu-$(CONFIG_MMU_NOTIFIER) += amdgpu_mn.o
include $(FULL_AMD_PATH)/powerplay/Makefile include $(FULL_AMD_PATH)/powerplay/Makefile
......
This diff is collapsed.
...@@ -34,7 +34,7 @@ enum amdgpu_mn_type { ...@@ -34,7 +34,7 @@ enum amdgpu_mn_type {
AMDGPU_MN_TYPE_HSA, AMDGPU_MN_TYPE_HSA,
}; };
#if defined(CONFIG_HMM_MIRROR) #if defined(CONFIG_MMU_NOTIFIER)
void amdgpu_mn_lock(struct amdgpu_mn *mn); void amdgpu_mn_lock(struct amdgpu_mn *mn);
void amdgpu_mn_unlock(struct amdgpu_mn *mn); void amdgpu_mn_unlock(struct amdgpu_mn *mn);
struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev, struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment