drm/i915: switch to drm_fb_helper_remove_conflicting_pci_framebuffers (f2521f77) · Commits · 戴 / test

drivers/gpu/drm/i915/i915_drv.c

+2 −39

Original line number	Diff line number	Diff line
		@@ -766,31 +766,6 @@ out:
		return ret;
		}

		static int i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv)
		{
		struct apertures_struct *ap;
		struct pci_dev *pdev = dev_priv->drm.pdev;
		struct i915_ggtt *ggtt = &dev_priv->ggtt;
		bool primary;
		int ret;

		ap = alloc_apertures(1);
		if (!ap)
		return -ENOMEM;

		ap->ranges[0].base = ggtt->gmadr.start;
		ap->ranges[0].size = ggtt->mappable_end;

		primary =
		pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;

		ret = drm_fb_helper_remove_conflicting_framebuffers(ap, "inteldrmfb", primary);

		kfree(ap);

		return ret;
		}

		static void intel_init_dpio(struct drm_i915_private *dev_priv)
		{
		/*
		@@ -1570,21 +1545,9 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
		if (ret)
		goto err_perf;

		/*
		* WARNING: Apparently we must kick fbdev drivers before vgacon,
		* otherwise the vga fbdev driver falls over.
		*/
		ret = i915_kick_out_firmware_fb(dev_priv);
		if (ret) {
		DRM_ERROR("failed to remove conflicting framebuffer drivers\n");
		goto err_ggtt;
		}

		ret = vga_remove_vgacon(pdev);
		if (ret) {
		DRM_ERROR("failed to remove conflicting VGA console\n");
		ret = drm_fb_helper_remove_conflicting_pci_framebuffers(pdev, "inteldrmfb");
		if (ret)
		goto err_ggtt;
		}

		ret = i915_ggtt_init_hw(dev_priv);
		if (ret)