drm/amdgpu: fix HMM config dependency issue
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix HMM config dependency issue
Only select HMM_MIRROR will get kernel config dependency warnings if CONFIG_HMM is missing in the config. Add depends on HMM will solve the issue.
Add conditional compilation to fix compilation errors if HMM_MIRROR is not enabled as HMM config is not enabled.
--- drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 ++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 ++++++++++++ 3 files changed, 19 insertions(+)
drivers/gpu/drm/amd/amdgpu/Kconfig +1 -0
@@ -26,6 +26,7 @@ config DRM_AMDGPU_CIK config DRM_AMDGPU_USERPTR bool "Always enable userptr write support" depends on DRM_AMDGPU + depends on ARCH_HAS_HMM select HMM_MIRROR help This option selects CONFIG_HMM and CONFIG_HMM_MIRROR if it
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +6 -0
@@ -712,7 +712,9 @@ struct amdgpu_ttm_tt {uint64_t userptr;struct task_struct *usertask;uint32_t userflags; +#if IS_ENABLED (CONFIG_DRM_AMDGPU_USERPTR )struct hmm_range range; +#endif };/**
@@ -722,6 +724,7 @@ struct amdgpu_ttm_tt {* Calling function must call amdgpu_ttm_tt_userptr_range_done() once and only * once afterwards to stop HMM tracking */ +#if IS_ENABLED (CONFIG_DRM_AMDGPU_USERPTR )int amdgpu_ttm_tt_get_user_pages (struct ttm_tt *ttm,struct page **pages) {struct amdgpu_ttm_tt *gtt = (void *)ttm;
@@ -804,6 +807,7 @@ bool amdgpu_ttm_tt_get_user_pages_done(struct ttm_tt *ttm) return r; } +#endif /** * amdgpu_ttm_tt_set_user_pages - Copy pages in, putting old pages as necessary.
@@ -904,9 +908,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm)sg_free_table (ttm->sg); +#if IS_ENABLED (CONFIG_DRM_AMDGPU_USERPTR )if (gtt->range.pfns && ttm->pages[0 ] ==hmm_pfn_to_page (>t->range, gtt->range.pfns[0 ]))WARN_ONCE (1 ,"Missing get_user_page_done\n" ); +#endif } int amdgpu_ttm_gart_bind(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +12 -0
@@ -101,8 +101,20 @@ int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);int amdgpu_ttm_alloc_gart (struct ttm_buffer_object *bo);int amdgpu_ttm_recover_gart (struct ttm_buffer_object *tbo); +#if IS_ENABLED (CONFIG_DRM_AMDGPU_USERPTR )int amdgpu_ttm_tt_get_user_pages (struct ttm_tt *ttm,struct page **pages);bool amdgpu_ttm_tt_get_user_pages_done (struct ttm_tt *ttm); +#else +static inline int amdgpu_ttm_tt_get_user_pages (struct ttm_tt *ttm,struct page **pages) +{ +return -EPERM ; +} +static inline bool amdgpu_ttm_tt_get_user_pages_done (struct ttm_tt *ttm) +{ +return false; +} +#endif +void amdgpu_ttm_tt_set_user_pages (struct ttm_tt *ttm,struct page **pages);void amdgpu_ttm_tt_mark_user_pages (struct ttm_tt *ttm); int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Kuehling, Felix
Reviewed-by Felix KuehlingQuoted 9 lines · Philip
Only select
HMM_MIRRORwill get kernel config dependency warnings ifCONFIG_HMMis missing in the config. Add depends on HMM will solve the issue.Add conditional compilation to fix compilation errors if
HMM_MIRRORis not enabled as HMM config is not enabled.Change-Id I1b44a0b5285bbef5e98bfb045d1d82c167af1cb8Signed-off-by Philip Yang <[email protected]>
See one semi-related comment inline ...
Quoted 74 lines
--- drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 ++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 ++++++++++++ 3 files changed, 19 insertions(+)drivers/gpu/drm/amd/amdgpu/Kconfig +1
-0@@ -26,6 +26,7 @@ config DRM_AMDGPU_CIK config DRM_AMDGPU_USERPTR bool "Always enable userptr write support" depends on DRM_AMDGPU + depends on ARCH_HAS_HMM select HMM_MIRROR help This option selects CONFIG_HMM and CONFIG_HMM_MIRROR if itdrivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +6
-0@@ -712,7 +712,9 @@ struct amdgpu_ttm_tt {uint64_t userptr;struct task_struct *usertask;uint32_t userflags; +#if IS_ENABLED (CONFIG_DRM_AMDGPU_USERPTR )struct hmm_range range; +#endif };/** @@ -722,6 +724,7 @@ struct amdgpu_ttm_tt {* Calling function must call amdgpu_ttm_tt_userptr_range_done() once and only * once afterwards to stop HMM tracking */ +#if IS_ENABLED (CONFIG_DRM_AMDGPU_USERPTR )int amdgpu_ttm_tt_get_user_pages (struct ttm_tt *ttm,struct page **pages) {struct amdgpu_ttm_tt *gtt = (void *)ttm;@@ -804,6 +807,7 @@ bool amdgpu_ttm_tt_get_user_pages_done(struct ttm_tt *ttm) return r; } +#endif /** * amdgpu_ttm_tt_set_user_pages - Copy pages in, putting old pages as necessary. @@ -904,9 +908,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm)sg_free_table (ttm->sg); +#if IS_ENABLED (CONFIG_DRM_AMDGPU_USERPTR )if (gtt->range.pfns && ttm->pages[0 ] ==hmm_pfn_to_page (>t->range, gtt->range.pfns[0 ]))WARN_ONCE (1 ,"Missing get_user_page_done\n" ); +#endif } int amdgpu_ttm_gart_bind(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +4
-0@@ -101,8 +101,20 @@ int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);int amdgpu_ttm_alloc_gart (struct ttm_buffer_object *bo);int amdgpu_ttm_recover_gart (struct ttm_buffer_object *tbo); +#if IS_ENABLED (CONFIG_DRM_AMDGPU_USERPTR )int amdgpu_ttm_tt_get_user_pages (struct ttm_tt *ttm,struct page **pages);bool amdgpu_ttm_tt_get_user_pages_done (struct ttm_tt *ttm); +#else +static inline int amdgpu_ttm_tt_get_user_pages (struct ttm_tt *ttm,struct page **pages) +{
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma); · line 119
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +8
-0+ return -EPERM; +} +static inline bool amdgpu_ttm_tt_get_user_pages_done (struct ttm_tt *ttm) +{ +return false; +} +#endif +void amdgpu_ttm_tt_set_user_pages (struct ttm_tt *ttm,struct page **pages);void amdgpu_ttm_tt_mark_user_pages (struct ttm_tt *ttm);
mark_user_pages isn't used any more. This function could be removed.
Regards,
Felix
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma); · line 120
Quoted 1 line
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +0
-0int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx