diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-05-26 14:18:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-05-26 14:41:03 +1000 |
| commit | 7dbbdd37f2ae7dd4175ba3f86f4335c463b18403 (patch) | |
| tree | 8ae7b37cb1d96b400425c6001241036e15966e6b /drivers/gpu/drm/nouveau | |
| parent | 918b73dcfc69f976d6210028dcb50fbcd15c15ae (diff) | |
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 <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Fixes: 2dd4d163cd9c ("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>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index eb10c80ed853..ac93d12201dc 100644 --- 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; |