Without this, we attempt the handover too late, the firmware fb might be accessing the chip simultaneously to us re-initializing various parts of it, which might frighten babies or cause all sort of nasty psychologic trauma to kitten.

Signed-off-by: Benjamin Herrenschmidt benh@kernel.crashing.org --- drivers/gpu/drm/radeon/radeon_device.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index cc1464b..9a3e6ba 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -594,6 +594,21 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev) }

+static void radeon_kick_out_firmware_fb(struct drm_device *ddev) +{ + struct apertures_struct *ap; + bool primary = false; + + ap = alloc_apertures(1); + ap->ranges[0].base = drm_get_resource_start(ddev, 0); + ap->ranges[0].size = drm_get_resource_len(ddev, 0); + +#ifdef CONFIG_X86 + primary = dev->pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; +#endif + remove_conflicting_framebuffers(ap, "radeondrmfb", primary); +} + int radeon_device_init(struct radeon_device *rdev, struct drm_device *ddev, struct pci_dev *pdev, @@ -633,6 +648,9 @@ int radeon_device_init(struct radeon_device *rdev, init_waitqueue_head(&rdev->irq.vblank_queue); init_waitqueue_head(&rdev->irq.idle_queue);

+ /* Get rid of things like offb */ + radeon_kick_out_firmware_fb(ddev); + /* setup workqueue */ rdev->wq = create_workqueue("radeon"); if (rdev->wq == NULL)