OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
918b73d
)
drm/nouveau: use correct conflicting framebuffer API
author
Dave Airlie
<airlied@redhat.com>
Tue, 26 May 2020 04:18:27 +0000
(14:18 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 26 May 2020 04:41:03 +0000
(14:41 +1000)
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>
drivers/gpu/drm/nouveau/nouveau_drm.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_drm.c
b/drivers/gpu/drm/nouveau/nouveau_drm.c
index
eb10c80
..
ac93d12
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;