On Fri, Nov 24, 2017 at 12:53 PM, Michał Mirosław mirq-linux@rere.qmqm.pl wrote:
Signed-off-by: Michał Mirosław mirq-linux@rere.qmqm.pl
radeon and amdgpu patches (3 and 7) are: Acked-by: Alex Deucher alexander.deucher@amd.com
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index dd2f060d62a8..b726222b7dd4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -537,27 +537,6 @@ MODULE_DEVICE_TABLE(pci, pciidlist);
static struct drm_driver kms_driver;
-static int amdgpu_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
drm_fb_helper_remove_conflicting_framebuffers(ap, "amdgpudrmfb", primary);kfree(ap);return 0;-}
static int amdgpu_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -580,7 +559,7 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, return ret;
/* Get rid of things like offb */
ret = amdgpu_kick_out_firmware_fb(pdev);
ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, 0, "amdgpudrmfb"); if (ret) return ret;-- 2.11.0
amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx