* [PATCH v2] drm: import DMA_BUF module namespace
@ 2021-10-27 21:25 Marcel Ziswiler
2021-10-29 18:51 ` Thomas Zimmermann
0 siblings, 1 reply; 6+ messages in thread
From: Marcel Ziswiler @ 2021-10-27 21:25 UTC (permalink / raw)
To: Linux-Next Mailing List, dri-devel, open list, Linux ARM,
Thomas Zimmermann
Cc: Maxime Ripard, Arnd Bergmann, Maarten Lankhorst,
Stephen Rothwell, Andrey Konovalov, Alexandre Belloni,
Linus Walleij, Daniel Vetter, David Airlie, Marcel Ziswiler,
Linux Kernel Functional Testing
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>
---
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");
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] drm: import DMA_BUF module namespace
2021-10-27 21:25 [PATCH v2] drm: import DMA_BUF module namespace Marcel Ziswiler
@ 2021-10-29 18:51 ` Thomas Zimmermann
2021-10-31 2:21 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Zimmermann @ 2021-10-29 18:51 UTC (permalink / raw)
To: Marcel Ziswiler, Linux-Next Mailing List, dri-devel, open list,
Linux ARM
Cc: Maxime Ripard, Arnd Bergmann, Maarten Lankhorst,
Stephen Rothwell, Andrey Konovalov, Alexandre Belloni,
Linus Walleij, Daniel Vetter, David Airlie, Marcel Ziswiler,
Linux Kernel Functional Testing
[-- Attachment #1.1: Type: text/plain, Size: 2685 bytes --]
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");
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] drm: import DMA_BUF module namespace
2021-10-29 18:51 ` Thomas Zimmermann
@ 2021-10-31 2:21 ` Stephen Rothwell
2021-10-31 3:30 ` Stephen Rothwell
2021-10-31 18:13 ` Thomas Zimmermann
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-10-31 2:21 UTC (permalink / raw)
To: Thomas Zimmermann, Greg KH
Cc: Marcel Ziswiler, Linux-Next Mailing List, dri-devel, open list,
Linux ARM, Maxime Ripard, Arnd Bergmann, Maarten Lankhorst,
Andrey Konovalov, Alexandre Belloni, Linus Walleij,
Daniel Vetter, David Airlie, Marcel Ziswiler,
Linux Kernel Functional Testing
[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] drm: import DMA_BUF module namespace
2021-10-31 2:21 ` Stephen Rothwell
@ 2021-10-31 3:30 ` Stephen Rothwell
2021-10-31 18:13 ` Thomas Zimmermann
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-10-31 3:30 UTC (permalink / raw)
To: Thomas Zimmermann, Greg KH
Cc: Marcel Ziswiler, Linux-Next Mailing List, dri-devel, open list,
Linux ARM, Maxime Ripard, Arnd Bergmann, Maarten Lankhorst,
Andrey Konovalov, Alexandre Belloni, Linus Walleij,
Daniel Vetter, David Airlie, Marcel Ziswiler,
Linux Kernel Functional Testing
[-- Attachment #1: Type: text/plain, Size: 946 bytes --]
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")
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] drm: import DMA_BUF module namespace
2021-10-31 2:21 ` Stephen Rothwell
2021-10-31 3:30 ` Stephen Rothwell
@ 2021-10-31 18:13 ` Thomas Zimmermann
2021-10-31 21:25 ` Stephen Rothwell
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Zimmermann @ 2021-10-31 18:13 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH
Cc: Marcel Ziswiler, Linux-Next Mailing List, dri-devel, open list,
Linux ARM, Maxime Ripard, Arnd Bergmann, Maarten Lankhorst,
Andrey Konovalov, Alexandre Belloni, Linus Walleij,
Daniel Vetter, David Airlie, Marcel Ziswiler,
Linux Kernel Functional Testing
[-- Attachment #1.1: Type: text/plain, Size: 1691 bytes --]
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.
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] drm: import DMA_BUF module namespace
2021-10-31 18:13 ` Thomas Zimmermann
@ 2021-10-31 21:25 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2021-10-31 21:25 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: Greg KH, Marcel Ziswiler, Linux-Next Mailing List, dri-devel,
open list, Linux ARM, Maxime Ripard, Arnd Bergmann,
Maarten Lankhorst, Andrey Konovalov, Alexandre Belloni,
Linus Walleij, Daniel Vetter, David Airlie, Marcel Ziswiler,
Linux Kernel Functional Testing
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
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! :-)
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-10-31 21:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-27 21:25 [PATCH v2] drm: import DMA_BUF module namespace Marcel Ziswiler
2021-10-29 18:51 ` Thomas Zimmermann
2021-10-31 2:21 ` Stephen Rothwell
2021-10-31 3:30 ` Stephen Rothwell
2021-10-31 18:13 ` Thomas Zimmermann
2021-10-31 21:25 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).