[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1372940714-12470-14-git-send-email-dh.herrmann@gmail.com>
Date: Thu, 4 Jul 2013 14:25:13 +0200
From: David Herrmann <dh.herrmann@...il.com>
To: linux-kernel@...r.kernel.org
Cc: David Airlie <airlied@...ux.ie>, dri-devel@...ts.freedesktop.org,
David Herrmann <dh.herrmann@...il.com>
Subject: [PATCH v2 13/14] drm/i915: use new drm_kick_out_firmware()
Use the new DRM infrastructure to kick out firmware DRM drivers before
loading i915.
Signed-off-by: David Herrmann <dh.herrmann@...il.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 3b315ba..d525b49 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1436,9 +1436,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.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists