lkml.org 
[lkml]   [2013]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 14/14] drm/radeon: use new drm_kick_out_firmware()
Date
Kick out firmware DRM and fbdev drivers via the new
drm_kick_out_firmware() before loading radeon.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---
drivers/gpu/drm/radeon/radeon_drv.c | 28 ----------------------------
drivers/gpu/drm/radeon/radeon_kms.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 094e7e5..8ed3ab3 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -308,37 +308,9 @@ static struct drm_driver driver_old = {

static struct drm_driver kms_driver;

-static int radeon_kick_out_firmware_fb(struct pci_dev *pdev)
-{
- struct apertures_struct *ap;
- bool primary = false;
-
- ap = alloc_apertures(1);
- if (!ap)
- return -ENOMEM;
-
- ap->ranges[0].base = pci_resource_start(pdev, 0);
- ap->ranges[0].size = pci_resource_len(pdev, 0);
-
-#ifdef CONFIG_X86
- primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
-#endif
- remove_conflicting_framebuffers(ap, "radeondrmfb", primary);
- kfree(ap);
-
- return 0;
-}
-
static int radeon_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
- int ret;
-
- /* Get rid of things like offb */
- ret = radeon_kick_out_firmware_fb(pdev);
- if (ret)
- return ret;
-
return drm_get_pci_dev(pdev, ent, &kms_driver);
}

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 4f2d4f4..f199b3c 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -62,6 +62,30 @@ done_free:
return 0;
}

+static int radeon_kick_out_firmware(struct drm_device *dev)
+{
+ struct pci_dev *pdev = dev->pdev;
+ struct apertures_struct *ap;
+ bool primary = false;
+
+ ap = alloc_apertures(1);
+ if (!ap)
+ return -ENOMEM;
+
+ ap->ranges[0].base = pci_resource_start(pdev, 0);
+ ap->ranges[0].size = pci_resource_len(pdev, 0);
+
+#ifdef CONFIG_X86
+ primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
+#endif
+
+ drm_kick_out_firmware(ap, primary);
+ dev->apertures = ap;
+ dev->apert_boot = primary;
+
+ return 0;
+}
+
/**
* radeon_driver_load_kms - Main load function for KMS.
*
@@ -86,6 +110,12 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
}
dev->dev_private = (void *)rdev;

+ r = radeon_kick_out_firmware(dev);
+ if (r) {
+ kfree(rdev);
+ return r;
+ }
+
/* update BUS flag */
if (drm_pci_device_is_agp(dev)) {
flags |= RADEON_IS_AGP;
--
1.8.3.2


\
 
 \ /
  Last update: 2013-07-04 15:21    [W:0.107 / U:0.372 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site