Commit 7dbbdd37 authored by Dave Airlie's avatar Dave Airlie

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: default avatarRandy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Fixes: 2dd4d163 ("drm/nouveau: remove open-coded version of remove_conflicting_pci_framebuffers()")
Link: https://lore.kernel.org/lkml/21b52c28-3ace-cd13-d8ce-f38f2c6b2a96@infradead.org/T/#uSigned-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 918b73dc
...@@ -697,7 +697,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev, ...@@ -697,7 +697,7 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
nvkm_device_del(&device); nvkm_device_del(&device);
/* Remove conflicting drivers (vesafb, efifb etc). */ /* 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) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment