Use the new DRM infrastructure to kick out firmware DRM drivers before
loading i915.
Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
Signed-off-by: David Herrmann <dh.herrm...@gmail.com>
---
drivers/gpu/drm/i915/i915_dma.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 3e4e607..9d375a6 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1414,9 +1414,9 @@ static void i915_kick_out_firmware_fb(struct
drm_i915_private *dev_priv)
primary =
pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW;
- remove_conflicting_framebuffers(ap, "inteldrmfb", primary);
-
- kfree(ap);
+ drm_kick_out_firmware(ap, primary);
+ dev_priv->dev->apertures = ap;
+ dev_priv->dev->apert_boot = primary;
}
static void i915_dump_device_info(struct drm_i915_private *dev_priv)
--
1.8.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
