From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Herrmann Subject: [PATCH v4 5/6] drm/i915: use new drm_kick_out_firmware() Date: Sun, 1 Sep 2013 15:36:51 +0200 Message-ID: <1378042612-5354-6-git-send-email-dh.herrmann@gmail.com> References: <1378042612-5354-1-git-send-email-dh.herrmann@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f48.google.com (mail-ee0-f48.google.com [74.125.83.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C24CE60C7 for ; Sun, 1 Sep 2013 06:37:09 -0700 (PDT) Received: by mail-ee0-f48.google.com with SMTP id l10so1795232eei.7 for ; Sun, 01 Sep 2013 06:37:09 -0700 (PDT) In-Reply-To: <1378042612-5354-1-git-send-email-dh.herrmann@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter List-Id: dri-devel@lists.freedesktop.org Use the new DRM infrastructure to kick out firmware DRM drivers before loading i915. Cc: Daniel Vetter Signed-off-by: David Herrmann --- 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