Skip to content

Commit 7dbbdd3

Browse files
committed
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: 2dd4d16 ("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]>
1 parent 918b73d commit 7dbbdd3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/nouveau/nouveau_drm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
697697
nvkm_device_del(&device);
698698

699699
/* Remove conflicting drivers (vesafb, efifb etc). */
700-
ret = remove_conflicting_pci_framebuffers(pdev, "nouveaufb");
700+
ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "nouveaufb");
701701
if (ret)
702702
return ret;
703703

0 commit comments

Comments
 (0)