diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:27 +0200 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:27 +0200 |
commit | 9c7f5cf088789957dcfb460cca1ab0fb578f2376 (patch) | |
tree | 6f5f305e5021fe5babb17feaf67be99d0f33e2ba /drivers/video/fbdev/carminefb.c | |
parent | 592c718e422de34b4c56ee66d2f02d3726b244ab (diff) | |
parent | 5727dcfd8486399c40e39d2c08fe36fedab29d99 (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/carminefb.c')
-rw-r--r-- | drivers/video/fbdev/carminefb.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/fbdev/carminefb.c b/drivers/video/fbdev/carminefb.c index 3a1c2e0739a1..4651b48a87f9 100644 --- a/drivers/video/fbdev/carminefb.c +++ b/drivers/video/fbdev/carminefb.c @@ -7,6 +7,7 @@ * - FB1 is display 1 with unique memory area * - both display use 32 bit colors */ +#include <linux/aperture.h> #include <linux/delay.h> #include <linux/errno.h> #include <linux/fb.h> @@ -614,6 +615,10 @@ static int carminefb_probe(struct pci_dev *dev, const struct pci_device_id *ent) struct fb_info *info; int ret; + ret = aperture_remove_conflicting_pci_devices(dev, "carminefb"); + if (ret) + return ret; + ret = pci_enable_device(dev); if (ret) return ret; |