From patchwork Sun Sep 1 13:36:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 2852564 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7784B9F313 for ; Sun, 1 Sep 2013 13:42:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A02AB202A7 for ; Sun, 1 Sep 2013 13:42:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7FF99202A1 for ; Sun, 1 Sep 2013 13:42:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 47B49E64DE for ; Sun, 1 Sep 2013 06:42:55 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ueZWrnwAW501+N376oSYodx4vKIApSwuMClNHepPPig=; b=KuYP6rmpaxjJoW7+LDTJjAudyHRIKsq4j1d+OkdbG0waO1lTPC286LU+qRiO1RwlVa ewYlwZjLM4dLpzg62xQXdmL0WRvGYekHUeE54XXkt5qYKXXXcxAiyeHQg/rXCgGgI9n3 YpBWDJnjn9I+6t9CpiKHVS1Qjqji/vAkZHEAKZABWsTWFw/b1vvBHuRas/XWw1QTkkyv GACZff/Fn6HDfJlqYKEZ0pzp9UxBHV4CDQyuMcs+TfFHWV8SsI2aJQ5OR24/hshsdYv3 VQsMqrpSlAUyTDpuPe7Ti3/Tn98hm8UyzMCexF+Q8mY0CQmocwG4QGk9lyUHaRUJ9Rct n2tw== X-Received: by 10.14.176.8 with SMTP id a8mr29073406eem.12.1378042628948; Sun, 01 Sep 2013 06:37:08 -0700 (PDT) Received: from localhost.localdomain (stgt-5f719c52.pool.mediaWays.net. [95.113.156.82]) by mx.google.com with ESMTPSA id r48sm13381024eev.14.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 01 Sep 2013 06:37:08 -0700 (PDT) From: David Herrmann To: dri-devel@lists.freedesktop.org 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> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1378042612-5354-1-git-send-email-dh.herrmann@gmail.com> References: <1378042612-5354-1-git-send-email-dh.herrmann@gmail.com> Cc: Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)