| Message ID | 20211027212506.3418521-1-marcel@ziswiler.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm: import DMA_BUF module namespace | expand |
Hi Am 27.10.21 um 23:25 schrieb Marcel Ziswiler: > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > Today's -next fails building arm64 defconfig as follows: > > ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vunmap from > namespace DMA_BUF, but does not import it. > ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vmap from > namespace DMA_BUF, but does not import it. > > Reported-by: Linux Kernel Functional Testing <lkft@linaro.org> > Fixes: commit 4b2b5e142ff4 ("drm: Move GEM memory managers into modules") > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> I added this fix into drm-misc-next. Thanks! However, I had to import linux-next while doing so. 'Git am' did a 3-way merge, which may result in a conflict when the fix reaches linux-next again. I also updated the commit description. Best regards Thomas > > --- > > Changes in v2: > - After consulting the documentation move it to the bottom of the file > where the other MODULE statements are as suggested by Thomas. > - Also move it down there for the drm_gem_shmem_helper.c file. > > drivers/gpu/drm/drm_gem_cma_helper.c | 1 + > drivers/gpu/drm/drm_gem_shmem_helper.c | 3 +-- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c > index 6f7b3f8ec04d3..2a34241fee025 100644 > --- a/drivers/gpu/drm/drm_gem_cma_helper.c > +++ b/drivers/gpu/drm/drm_gem_cma_helper.c > @@ -581,4 +581,5 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev, > EXPORT_SYMBOL(drm_gem_cma_prime_import_sg_table_vmap); > > MODULE_DESCRIPTION("DRM CMA memory-management helpers"); > +MODULE_IMPORT_NS(DMA_BUF); > MODULE_LICENSE("GPL"); > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index f7324582afe71..a5b743a83ce99 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -22,8 +22,6 @@ > #include <drm/drm_prime.h> > #include <drm/drm_print.h> > > -MODULE_IMPORT_NS(DMA_BUF); > - > /** > * DOC: overview > * > @@ -779,4 +777,5 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev, > EXPORT_SYMBOL_GPL(drm_gem_shmem_prime_import_sg_table); > > MODULE_DESCRIPTION("DRM SHMEM memory-management helpers"); > +MODULE_IMPORT_NS(DMA_BUF); > MODULE_LICENSE("GPL v2"); >
Hi Thomas, On Fri, 29 Oct 2021 20:51:52 +0200 Thomas Zimmermann <tzimmermann@suse.de> wrote: > > Am 27.10.21 um 23:25 schrieb Marcel Ziswiler: > > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > > > Today's -next fails building arm64 defconfig as follows: > > > > ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vunmap from > > namespace DMA_BUF, but does not import it. > > ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vmap from > > namespace DMA_BUF, but does not import it. > > > > Reported-by: Linux Kernel Functional Testing <lkft@linaro.org> > > Fixes: commit 4b2b5e142ff4 ("drm: Move GEM memory managers into modules") > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > I added this fix into drm-misc-next. Thanks! > > However, I had to import linux-next while doing so. 'Git am' did a > 3-way merge, which may result in a conflict when the fix reaches > linux-next again. I also updated the commit description. You cannot merge linux-next into any tree, sorry. It rebases every day (and so do several of the included trees). Your fix patch should be sent to Greg KH and Arnd as the build failure is introduced in the char-misc tree.
Hi all, On Sun, 31 Oct 2021 13:21:55 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > On Fri, 29 Oct 2021 20:51:52 +0200 Thomas Zimmermann <tzimmermann@suse.de> wrote: > > > > Am 27.10.21 um 23:25 schrieb Marcel Ziswiler: > > > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > > > > > Today's -next fails building arm64 defconfig as follows: > > > > > > ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vunmap from > > > namespace DMA_BUF, but does not import it. > > > ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vmap from > > > namespace DMA_BUF, but does not import it. > > > > > > Reported-by: Linux Kernel Functional Testing <lkft@linaro.org> > > > Fixes: commit 4b2b5e142ff4 ("drm: Move GEM memory managers into modules") Oh, and it is actually: Fixes: 16b0314aa746 ("dma-buf: move dma-buf symbols into the DMA_BUF module namespace")
Hi Am 31.10.21 um 03:21 schrieb Stephen Rothwell: > Hi Thomas, > > On Fri, 29 Oct 2021 20:51:52 +0200 Thomas Zimmermann <tzimmermann@suse.de> wrote: >> >> Am 27.10.21 um 23:25 schrieb Marcel Ziswiler: >>> From: Marcel Ziswiler <marcel.ziswiler@toradex.com> >>> >>> Today's -next fails building arm64 defconfig as follows: >>> >>> ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vunmap from >>> namespace DMA_BUF, but does not import it. >>> ERROR: modpost: module drm_cma_helper uses symbol dma_buf_vmap from >>> namespace DMA_BUF, but does not import it. >>> >>> Reported-by: Linux Kernel Functional Testing <lkft@linaro.org> >>> Fixes: commit 4b2b5e142ff4 ("drm: Move GEM memory managers into modules") >>> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> >> >> I added this fix into drm-misc-next. Thanks! >> >> However, I had to import linux-next while doing so. 'Git am' did a >> 3-way merge, which may result in a conflict when the fix reaches >> linux-next again. I also updated the commit description. > > You cannot merge linux-next into any tree, sorry. It rebases every day > (and so do several of the included trees). No no, don't worry. I meant 'import' as in 'git remote add linux-next'. I was actually complaining that the provided fix was not against a DRM tree. Best regards Thomas > > Your fix patch should be sent to Greg KH and Arnd as the build failure > is introduced in the char-misc tree. >
Hi Thomas, On Sun, 31 Oct 2021 19:13:17 +0100 Thomas Zimmermann <tzimmermann@suse.de> wrote: > > No no, don't worry. I meant 'import' as in 'git remote add > linux-next'. I was actually complaining that the provided fix was not > against a DRM tree. Phew! :-)
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index 6f7b3f8ec04d3..2a34241fee025 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -581,4 +581,5 @@ drm_gem_cma_prime_import_sg_table_vmap(struct drm_device *dev, EXPORT_SYMBOL(drm_gem_cma_prime_import_sg_table_vmap); MODULE_DESCRIPTION("DRM CMA memory-management helpers"); +MODULE_IMPORT_NS(DMA_BUF); MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index f7324582afe71..a5b743a83ce99 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -22,8 +22,6 @@ #include <drm/drm_prime.h> #include <drm/drm_print.h> -MODULE_IMPORT_NS(DMA_BUF); - /** * DOC: overview * @@ -779,4 +777,5 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev, EXPORT_SYMBOL_GPL(drm_gem_shmem_prime_import_sg_table); MODULE_DESCRIPTION("DRM SHMEM memory-management helpers"); +MODULE_IMPORT_NS(DMA_BUF); MODULE_LICENSE("GPL v2");