Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: move MMU notifier related defines to amdgpu_mn.h

Just some cleanup.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Christian König and committed by
Alex Deucher
9a189996 711becf0

+53 -24
+1 -24
drivers/gpu/drm/amd/amdgpu/amdgpu.h
··· 65 65 #include "amdgpu_uvd.h" 66 66 #include "amdgpu_vce.h" 67 67 #include "amdgpu_vcn.h" 68 + #include "amdgpu_mn.h" 68 69 69 70 #include "gpu_scheduler.h" 70 71 #include "amdgpu_virt.h" ··· 179 178 struct amdgpu_job; 180 179 struct amdgpu_irq_src; 181 180 struct amdgpu_fpriv; 182 - struct amdgpu_mn; 183 181 struct amdgpu_bo_va_mapping; 184 182 185 183 enum amdgpu_cp_irq { ··· 1199 1199 * Testing 1200 1200 */ 1201 1201 void amdgpu_test_moves(struct amdgpu_device *adev); 1202 - 1203 - /* 1204 - * MMU Notifier 1205 - */ 1206 - #if defined(CONFIG_MMU_NOTIFIER) 1207 - void amdgpu_mn_lock(struct amdgpu_mn *mn); 1208 - void amdgpu_mn_unlock(struct amdgpu_mn *mn); 1209 - struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev); 1210 - int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr); 1211 - void amdgpu_mn_unregister(struct amdgpu_bo *bo); 1212 - #else 1213 - static inline void amdgpu_mn_lock(struct amdgpu_mn *mn) {} 1214 - static inline void amdgpu_mn_unlock(struct amdgpu_mn *mn) {} 1215 - static inline struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev) 1216 - { 1217 - return NULL; 1218 - } 1219 - static inline int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr) 1220 - { 1221 - return -ENODEV; 1222 - } 1223 - static inline void amdgpu_mn_unregister(struct amdgpu_bo *bo) {} 1224 - #endif 1225 1202 1226 1203 /* 1227 1204 * Debugfs
+52
drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
··· 1 + /* 2 + * Copyright 2017 Advanced Micro Devices, Inc. 3 + * 4 + * Permission is hereby granted, free of charge, to any person obtaining a 5 + * copy of this software and associated documentation files (the "Software"), 6 + * to deal in the Software without restriction, including without limitation 7 + * the rights to use, copy, modify, merge, publish, distribute, sublicense, 8 + * and/or sell copies of the Software, and to permit persons to whom the 9 + * Software is furnished to do so, subject to the following conditions: 10 + * 11 + * The above copyright notice and this permission notice shall be included in 12 + * all copies or substantial portions of the Software. 13 + * 14 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 15 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 16 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 17 + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR 18 + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 19 + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 20 + * OTHER DEALINGS IN THE SOFTWARE. 21 + * 22 + * Authors: Christian König 23 + */ 24 + #ifndef __AMDGPU_MN_H__ 25 + #define __AMDGPU_MN_H__ 26 + 27 + /* 28 + * MMU Notifier 29 + */ 30 + struct amdgpu_mn; 31 + 32 + #if defined(CONFIG_MMU_NOTIFIER) 33 + void amdgpu_mn_lock(struct amdgpu_mn *mn); 34 + void amdgpu_mn_unlock(struct amdgpu_mn *mn); 35 + struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev); 36 + int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr); 37 + void amdgpu_mn_unregister(struct amdgpu_bo *bo); 38 + #else 39 + static inline void amdgpu_mn_lock(struct amdgpu_mn *mn) {} 40 + static inline void amdgpu_mn_unlock(struct amdgpu_mn *mn) {} 41 + static inline struct amdgpu_mn *amdgpu_mn_get(struct amdgpu_device *adev) 42 + { 43 + return NULL; 44 + } 45 + static inline int amdgpu_mn_register(struct amdgpu_bo *bo, unsigned long addr) 46 + { 47 + return -ENODEV; 48 + } 49 + static inline void amdgpu_mn_unregister(struct amdgpu_bo *bo) {} 50 + #endif 51 + 52 + #endif