Skip to content

Commit

Permalink
drm/nouveau: use correct conflicting framebuffer API
Browse files Browse the repository at this point in the history
nouveau was calling the fbdev API which has issues with modules
and built-ins. Call the correct API.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Fixes: 2dd4d16 ("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/#u
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Dave Airlie committed May 26, 2020
1 parent 918b73d commit 7dbbdd3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nouveau_drm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 7dbbdd3

Please sign in to comment.