summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/geode/gxfb_core.c
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2022-07-27 09:41:27 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2022-07-27 09:41:27 +0200
commit9c7f5cf088789957dcfb460cca1ab0fb578f2376 (patch)
tree6f5f305e5021fe5babb17feaf67be99d0f33e2ba /drivers/video/fbdev/geode/gxfb_core.c
parent592c718e422de34b4c56ee66d2f02d3726b244ab (diff)
parent5727dcfd8486399c40e39d2c08fe36fedab29d99 (diff)
Merge remote-tracking branch 'drm-misc/drm-misc-next' into drm-tip
# Conflicts: # drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Diffstat (limited to 'drivers/video/fbdev/geode/gxfb_core.c')
-rw-r--r--drivers/video/fbdev/geode/gxfb_core.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/fbdev/geode/gxfb_core.c b/drivers/video/fbdev/geode/gxfb_core.c
index 44089b331f91..2527bd80ec5f 100644
--- a/drivers/video/fbdev/geode/gxfb_core.c
+++ b/drivers/video/fbdev/geode/gxfb_core.c
@@ -15,6 +15,7 @@
*
* 16 MiB of framebuffer memory is assumed to be available.
*/
+#include <linux/aperture.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -364,6 +365,10 @@ static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
struct fb_videomode *modedb_ptr;
unsigned int modedb_size;
+ ret = aperture_remove_conflicting_pci_devices(pdev, "gxfb");
+ if (ret)
+ return ret;
+
info = gxfb_init_fbinfo(&pdev->dev);
if (!info)
return -ENOMEM;