projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-misc-next-2021-07-16' of git://anongit.freedesktop.org/drm/drm-misc...
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_drv.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index
abb9288
..
a959624
100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@
-1281,7
+1281,7
@@
static int amdgpu_pci_probe(struct pci_dev *pdev,
#endif
/* Get rid of things like offb */
- ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev,
"amdgpudrmfb"
);
+ ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev,
&amdgpu_kms_driver
);
if (ret)
return ret;