diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0634-drm-amdgpu-use-simpler-remove_conflicting_pci_frameb.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0634-drm-amdgpu-use-simpler-remove_conflicting_pci_frameb.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0634-drm-amdgpu-use-simpler-remove_conflicting_pci_frameb.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0634-drm-amdgpu-use-simpler-remove_conflicting_pci_frameb.patch new file mode 100644 index 00000000..34eec2c3 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0634-drm-amdgpu-use-simpler-remove_conflicting_pci_frameb.patch @@ -0,0 +1,64 @@ +From 9ad791082bc6bfebdbf1b9828c8f985d86589c24 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl> +Date: Sat, 1 Sep 2018 16:08:46 +0200 +Subject: [PATCH 0634/2940] drm/amdgpu: use simpler + remove_conflicting_pci_framebuffers() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> +Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> +Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> +Link: https://patchwork.freedesktop.org/patch/msgid/fe59ab587ef4ef799b525fcc03d87800c5dc26d9.1535810304.git.mirq-linux@rere.qmqm.pl +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 24 +----------------------- + 1 file changed, 1 insertion(+), 23 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +index 103fb93eba05..6b231cd069b0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -803,28 +803,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) + { +@@ -852,7 +830,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.17.1 + |