diff options
author | Dave Airlie <airlied@redhat.com> | 2012-06-01 06:12:39 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-01 06:12:39 -0400 |
commit | 08ef8e41a6f420c3c0998b50d478e0b2c267a226 (patch) | |
tree | b6f4935f9b03bf9d8df1349b36976d9aa4ea3d66 /drivers/gpu | |
parent | dedc14e2a6e85b357c2274e03af354201e0b5626 (diff) |
drm/mgag200: kick off conflicting framebuffers earlier.
It appears grub2 can pass framebuffer info via efifb, so
we need to kick it off earlier to reserve the vram allocation.
(just a fixup same as for cirrus)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 3c8e04f54713..93e832d6c328 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c | |||
@@ -41,9 +41,28 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { | |||
41 | 41 | ||
42 | MODULE_DEVICE_TABLE(pci, pciidlist); | 42 | MODULE_DEVICE_TABLE(pci, pciidlist); |
43 | 43 | ||
44 | static void mgag200_kick_out_firmware_fb(struct pci_dev *pdev) | ||
45 | { | ||
46 | struct apertures_struct *ap; | ||
47 | bool primary = false; | ||
48 | |||
49 | ap = alloc_apertures(1); | ||
50 | ap->ranges[0].base = pci_resource_start(pdev, 0); | ||
51 | ap->ranges[0].size = pci_resource_len(pdev, 0); | ||
52 | |||
53 | #ifdef CONFIG_X86 | ||
54 | primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; | ||
55 | #endif | ||
56 | remove_conflicting_framebuffers(ap, "mgag200drmfb", primary); | ||
57 | kfree(ap); | ||
58 | } | ||
59 | |||
60 | |||
44 | static int __devinit | 61 | static int __devinit |
45 | mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 62 | mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
46 | { | 63 | { |
64 | mgag200_kick_out_firmware_fb(pdev); | ||
65 | |||
47 | return drm_get_pci_dev(pdev, ent, &driver); | 66 | return drm_get_pci_dev(pdev, ent, &driver); |
48 | } | 67 | } |
49 | 68 | ||