drm/amdgpu: use simpler remove_conflicting_pci_framebuffers() (a62dfac0) · Commits · 戴 / test

Signed-off-by:

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+1 −23

Original line number	Diff line number	Diff line
		@@ -785,28 +785,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)
		{
		@@ -834,7 +812,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;