nouveau: add fbdev dependency
Subsystems (3)
PATCH 1/1 nouveau: add fbdev dependency
Calling directly into the fbdev stack only works when the fbdev layer is built into the kernel as well, or both are loadable modules:
drivers/gpu/drm/nouveau/nouveau_drm.o: in function `nouveau_drm_probe':
nouveau_drm.c:(.text+0x1f90): undefined reference to `remove_conflicting_pci_framebuffers'
The change seems to have been intentional, so add an explicit dependency here but allow it to still be compiled if FBDEV is completely disabled.
--- drivers/gpu/drm/nouveau/Kconfig | 1 + drivers/gpu/drm/nouveau/nouveau_drm.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/Kconfig +1 -0
@@ -18,6 +18,7 @@ config DRM_NOUVEAU select THERMAL if ACPI && X86 select ACPI_VIDEO if ACPI && X86 select SND_HDA_COMPONENT if SND_HDA_CORE + depends on FBDEV || !FBDEV help Choose this option for open-source NVIDIA support.
drivers/gpu/drm/nouveau/nouveau_drm.c +2 -1
@@ -697,7 +697,8 @@ static int nouveau_drm_probe(struct pci_dev *pdev,nvkm_device_del (&device);/* Remove conflicting drivers (vesafb, efifb etc). */ - ret =remove_conflicting_pci_framebuffers (pdev,"nouveaufb" ); +if (IS_ENABLED (CONFIG_FBDEV )) + ret =remove_conflicting_pci_framebuffers (pdev,"nouveaufb" );if (ret)return ret;
Signature · 1 line
2.26.2
Isn't this already fixed by
https://cgit.freedesktop.org/drm/drm/commit/?id=7dbbdd37f2ae7dd4175ba3f86f4335c463b18403
Quoted 52 lines · Arnd Bergmann
Calling directly into the fbdev stack only works when the fbdev layer is built into the kernel as well, or both are loadable modules:
drivers/gpu/drm/nouveau/nouveau_drm.o: in function `nouveau_drm_probe':
nouveau_drm.c:(.text+0x1f90): undefined reference to `remove_conflicting_pci_framebuffers'The change seems to have been intentional, so add an explicit dependency here but allow it to still be compiled if FBDEV is completely disabled.
Fixes 2dd4d163cd9c ("drm/nouveau: remove open-coded version of remove_conflicting_pci_framebuffers()")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/nouveau/Kconfig | 1 + drivers/gpu/drm/nouveau/nouveau_drm.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/nouveau/Kconfig +1
-0@@ -18,6 +18,7 @@ config DRM_NOUVEAU select THERMAL if ACPI && X86 select ACPI_VIDEO if ACPI && X86 select SND_HDA_COMPONENT if SND_HDA_CORE + depends on FBDEV || !FBDEV help Choose this option for open-source NVIDIA support.drivers/gpu/drm/nouveau/nouveau_drm.c +2
-2@@ -697,7 +697,8 @@ static int nouveau_drm_probe(struct pci_dev *pdev,nvkm_device_del (&device);/* Remove conflicting drivers (vesafb, efifb etc). */ - ret =remove_conflicting_pci_framebuffers (pdev,"nouveaufb" ); +if (IS_ENABLED (CONFIG_FBDEV )) + ret =remove_conflicting_pci_framebuffers (pdev,"nouveaufb" );if (ret)return ret; --2.26.2
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
Quoted 4 lines · Ilia Mirkin
Isn't this already fixed by
https://cgit.freedesktop.org/drm/drm/commit/?id=7dbbdd37f2ae7dd4175ba3f86f4335c463b18403
Ok, I see that fixes the link error, but I when I created my fix, that did not seem like the correct solution because it reverts part of the original patch without reverting the rest of it. Unfortunately there was no changelog text in the first patch to explain why this is safe.
Could you double-check if the behavior is still correct after the two patches?
Arnd
Dave Airlie
maintainerQuoted 11 lines · Arnd Bergmann
Quoted 4 lines · Ilia Mirkin
Isn't this already fixed by
https://cgit.freedesktop.org/drm/drm/commit/?id=7dbbdd37f2ae7dd4175ba3f86f4335c463b18403
Ok, I see that fixes the link error, but I when I created my fix, that did not seem like the correct solution because it reverts part of the original patch without reverting the rest of it. Unfortunately there was no changelog text in the first patch to explain why this is safe.
No it doesn't, I think you missed the pci in API name.
The initial behaviour doesn't use the pci version of the API, the replacement did, and the fix used the drm wrapper around the pci one.
So this patch isn't necessary now that I've fixed it the other way,
Thanks,
Dave.
Quoted 14 lines · Dave Airlie
Quoted 11 lines · Arnd Bergmann
Quoted 4 lines · Ilia Mirkin
Isn't this already fixed by
https://cgit.freedesktop.org/drm/drm/commit/?id=7dbbdd37f2ae7dd4175ba3f86f4335c463b18403
Ok, I see that fixes the link error, but I when I created my fix, that did not seem like the correct solution because it reverts part of the original patch without reverting the rest of it. Unfortunately there was no changelog text in the first patch to explain why this is safe.
Quoted 6 lines
No it doesn't, I think you missed the pci in API name.
The initial behaviour doesn't use the pci version of the API, the replacement did, and the fix used the drm wrapper around the pci one.
So this patch isn't necessary now that I've fixed it the other way,
Ok, got it, thanks for explaining!
Arnd