From: David Herrmann <dh.herrmann@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
David Herrmann <dh.herrmann@gmail.com>
Subject: [PATCH v2 13/14] drm/i915: use new drm_kick_out_firmware()
Date: Thu, 4 Jul 2013 14:25:13 +0200 [thread overview]
Message-ID: <1372940714-12470-14-git-send-email-dh.herrmann@gmail.com> (raw)
In-Reply-To: <1372940714-12470-1-git-send-email-dh.herrmann@gmail.com>
Use the new DRM infrastructure to kick out firmware DRM drivers before
loading i915.
Signed-off-by: David Herrmann <dh.herrmann@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 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
next prev parent reply other threads:[~2013-07-04 12:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-04 12:25 [PATCH v2 00/14] Platform Framebuffers and SimpleDRM David Herrmann
2013-07-04 12:25 ` [PATCH v2 01/14] fbdev: simplefb: add init through platform_data David Herrmann
2013-07-09 21:17 ` Stephen Warren
2013-07-04 12:25 ` [PATCH v2 02/14] fbdev: simplefb: mark as fw and allocate apertures David Herrmann
2013-07-04 12:25 ` [PATCH v2 03/14] x86: provide platform-devices for boot-framebuffers David Herrmann
2013-07-17 17:40 ` David Herrmann
2013-07-04 12:25 ` [PATCH v2 04/14] x86: sysfb: move EFI quirks from efifb to sysfb David Herrmann
2013-07-04 12:25 ` [PATCH v2 05/14] fbdev: simplefb: add 32bit RGB formats David Herrmann
2013-07-04 12:25 ` [PATCH v2 06/14] fbdev: vesafb: bind to platform-framebuffer device David Herrmann
2013-07-04 12:25 ` [PATCH v2 07/14] fbdev: efifb: bind to efi-framebuffer David Herrmann
2013-07-04 12:25 ` [PATCH v2 08/14] fbdev: fbcon: select VT_HW_CONSOLE_BINDING David Herrmann
2013-07-04 12:25 ` [PATCH v2 09/14] drm: add SimpleDRM driver David Herrmann
2013-07-04 12:25 ` [PATCH v2 10/14] drm: simpledrm: add fbdev fallback support David Herrmann
2013-07-04 12:25 ` [PATCH v2 11/14] drm: add helpers to kick out firmware drivers David Herrmann
2013-07-04 12:25 ` [PATCH v2 12/14] drm: nouveau: kick out firmware drivers during probe David Herrmann
2013-07-04 12:25 ` David Herrmann [this message]
2013-07-04 12:25 ` [PATCH v2 14/14] drm/radeon: use new drm_kick_out_firmware() David Herrmann
2013-07-04 17:48 ` [PATCH v2 00/14] Platform Framebuffers and SimpleDRM H. Peter Anvin
2013-07-05 13:09 ` David Herrmann
2013-07-09 21:02 ` Stephen Warren
2013-07-10 17:28 ` David Herrmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372940714-12470-14-git-send-email-dh.herrmann@gmail.com \
--to=dh.herrmann@gmail.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome