From 10e42ff5932e21a58946f2b79f46978292e77193 Mon Sep 17 00:00:00 2001 From: Christian Koenig Date: Fri, 8 Sep 2017 17:51:08 +0200 Subject: [PATCH 1807/4131] drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just some cleanup. Signed-off-by: Christian König Reviewed-by: Michel Dänzer Reviewed-by: Alex Deucher Conflicts: drivers/gpu/drm/amd/amdgpu/amdgpu.h Change-Id: Iee191903259ae178510dc2ae3fedbc413bdcff1f --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 8d82824..5d296c2 100755 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -67,6 +67,7 @@ #include "amdgpu_vce.h" #include "amdgpu_vcn.h" #include "amdgpu_dm.h" +#include "amdgpu_mn.h" #include "gpu_scheduler.h" #include "amdgpu_virt.h" @@ -183,7 +184,6 @@ struct amdgpu_job; struct amdgpu_irq_src; struct amdgpu_fpriv; struct kfd_vm_fault_info; -struct amdgpu_mn; struct amdgpu_bo_va_mapping; enum amdgpu_cp_irq { @@ -1227,29 +1227,6 @@ void amdgpu_benchmark(struct amdgpu_device *adev, int test_number); void amdgpu_test_moves(struct amdgpu_device *adev); /* - * MMU Notifier - */ -#if defined(CONFIG_MMU_NOTIFIER) -void amdgpu_mn_lock(struct amdgpu_mn *mn); -void amdgpu_mn_unlock(struct amdgpu_mn *mn); -struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev); -int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr); -void amdgpu_mn_unregister(struct amdgpu_bo *bo); -#else -static inline void amdgpu_mn_lock(struct amdgpu_mn *mn) {} -static inline void amdgpu_mn_unlock(struct amdgpu_mn *mn) {} -static inline struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev) -{ - return NULL; -} -static inline int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr) -{ - return -ENODEV; -} -static inline void amdgpu_mn_unregister(struct amdgpu_bo *bo) {} -#endif - -/* * Debugfs */ struct amdgpu_debugfs { -- 2.7.4