[PATCH v4 5/6] drm/i915: use new drm_kick_out_firmware()

[Daniel Vetter]

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 <daniel.vetter at ffwll.ch>
> Signed-off-by: David Herrmann <dh.herrmann at 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 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