drm/nouveau: use correct conflicting framebuffer API

nouveau was calling the fbdev API which has issues with modules
and built-ins. Call the correct API.

Reported-by: Randy Dunlap <[email protected]>
Acked-by: Randy Dunlap <[email protected]> # build-tested
Fixes: 2dd4d163cd9c ("drm/nouveau: remove open-coded version of remove_conflicting_pci_framebuffers()")
Link: https://lore.kernel.org/lkml/[email protected]/T/#u
Signed-off-by: Dave Airlie <[email protected]>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index eb10c80ed853ae7a87e7c30f785ec334809b4c5e..ac93d12201dc03439af423d83093c6b8a728da2d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -697,7 +697,7 @@ 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");
+       ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "nouveaufb");
        if (ret)
                return ret;