From: Daniel Vetter Subject: Re: [PATCH v4 5/6] drm/i915: use new drm_kick_out_firmware() Date: Mon, 2 Sep 2013 09:43:21 +0200 Message-ID: <20130902074321.GS9374@phenom.ffwll.local> References: <1378042612-5354-1-git-send-email-dh.herrmann@gmail.com> <1378042612-5354-6-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-ea0-f176.google.com (mail-ea0-f176.google.com [209.85.215.176]) by gabe.freedesktop.org (Postfix) with ESMTP id CE6E0E659B for ; Mon, 2 Sep 2013 00:43:07 -0700 (PDT) Received: by mail-ea0-f176.google.com with SMTP id q16so2149768ead.21 for ; Mon, 02 Sep 2013 00:43:07 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1378042612-5354-6-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: David Herrmann Cc: Daniel Vetter , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Sun, Sep 01, 2013 at 03:36:51PM +0200, David Herrmann wrote: > 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; What about passing dev to drm_kick_out_firmware and shovelling these two assignments in there? I've check your nouveau/radeon patches and I think this would work ... -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch