From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH 6/8] drm/i915: Wrap the preallocated BIOS
 framebuffer and preserve for KMS fbcon v7
Date: Tue, 17 Dec 2013 13:11:55 -0800
Message-ID: <20131217131155.185206c2@jbarnes-desktop>
References: <1387240469-932-1-git-send-email-jbarnes@virtuousgeek.org>
	<1387240469-932-6-git-send-email-jbarnes@virtuousgeek.org>
	<20131217192900.GV22448@nuc-i3427.alporthouse.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from alt-proxy13.mail.unifiedlayer.com
	(alt-proxy13.mail.unifiedlayer.com [67.222.34.81])
	by gabe.freedesktop.org (Postfix) with SMTP id 05199FD167
	for <intel-gfx@lists.freedesktop.org>;
	Tue, 17 Dec 2013 13:10:04 -0800 (PST)
In-Reply-To: <20131217192900.GV22448@nuc-i3427.alporthouse.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Sender: intel-gfx-bounces@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Tue, 17 Dec 2013 19:29:00 +0000
Chris Wilson <chris@chris-wilson.co.uk> wrote:

> On Mon, Dec 16, 2013 at 04:34:27PM -0800, Jesse Barnes wrote:
> >  int intel_fbdev_init(struct drm_device *dev)
> > @@ -268,17 +461,25 @@ int intel_fbdev_init(struct drm_device *dev)
> >  	struct drm_i915_private *dev_priv = dev->dev_private;
> >  	int ret;
> >  
> > -	ifbdev = kzalloc(sizeof(*ifbdev), GFP_KERNEL);
> > -	if (!ifbdev)
> > -		return -ENOMEM;
> > +	/* This may fail, if so, dev_priv->fbdev won't be set below */
> > +	intel_fbdev_init_bios(dev);
> >  
> > -	dev_priv->fbdev = ifbdev;
> > -	ifbdev->helper.funcs = &intel_fb_helper_funcs;
> > +	if ((ifbdev = dev_priv->fbdev) == NULL) {
> > +		ifbdev = kzalloc(sizeof(struct intel_fbdev), GFP_KERNEL);
> > +		if (ifbdev == NULL)
> > +			return -ENOMEM;
> > +
> > +		ifbdev->helper.funcs = &intel_fb_helper_funcs;
> > +		ifbdev->preferred_bpp = 32;
> > +
> > +		dev_priv->fbdev = ifbdev;
> > +	}
> 
> Since Daniel also mentioned the same bikeshed, I think this would look
> neater with the allocation here and ifbdev being passed to
> intel_fbdev_init_bios to fill in:
> 
> 	ifbdev = kzalloc(sizeof(*ifbdev), GFP_KERNEL);
> 	if (ifbdev == NULL)
> 		return -ENODEV;
> 	
> 	if (!intel_fbdev_init_bios(dev, ifbdev)) {
> 		ifbdev->helper.funcs = &intel_fb_helper_funcs;
> 		ifbdev->preferred_bpp = 32;
> 	}
> 
> 	dev_priv->fbdev = ifbdev;
> 	return 0;

Yeah, looks better that way.  Fixed.

-- 
Jesse Barnes, Intel Open Source Technology Center