linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Mundt <lethal@linux-sh.org>
To: Kronos <kronos@kronoz.cjb.net>
Cc: linux-fbdev-devel@lists.sourceforge.net,
	James Simmons <jsimmons@infradead.org>
Subject: Re: [PATCH] pvr2fb: New framebuffer_alloc API and class_dev changes
Date: Mon, 15 Sep 2003 18:06:07 -0400	[thread overview]
Message-ID: <20030915220607.GA2708@linux-sh.org> (raw)
In-Reply-To: <20030915215150.GA27662@dreamland.darkstar.lan>

[-- Attachment #1: Type: text/plain, Size: 1812 bytes --]

This looks fine. I'll merge the framebuffer_alloc() changes into my tree and
include it with the next batch of pvr2fb updates.

On Mon, Sep 15, 2003 at 11:51:50PM +0200, Kronos wrote:
> ======== drivers/video/pvr2fb.c 1.17 ========
> D 1.17 03/09/12 22:26:04+02:00 kronos@kronoz.cjb.net 19 18 4/8/796
> P drivers/video/pvr2fb.c
> C - make it compile again. something went wrong in the merge from 1.14.1.1 to 1.6
> C - switch to framebuffer_alloc
> ------------------------------------------------
> 
> ===== drivers/video/pvr2fb.c 1.16 vs 1.17 =====
> --- 1.16/drivers/video/pvr2fb.c	Mon Jul 14 20:09:25 2003
> +++ 1.17/drivers/video/pvr2fb.c	Fri Sep 12 22:26:04 2003
> @@ -609,17 +610,14 @@
>  	if (!MACH_DREAMCAST)
>  		return -ENXIO;
>  
> -	fb_info = kmalloc(sizeof(struct fb_info) + sizeof(struct pvr2fb_par) +
> -			  sizeof(u32) * 16, GFP_KERNEL);
> +	fb_info = framebuffer_alloc(sizeof(struct pvr2fb_par) + sizeof(u32) * 16, NULL);
>  	
>  	if (!fb_info) {
>  		printk(KERN_ERR "Failed to allocate memory for fb_info\n");
>  		return -ENOMEM;
>  	}
>  
> -	memset(fb_info, 0, sizeof(fb_info) + sizeof(struct pvr2fb_par) + sizeof(u32) * 16);
> -
> -	currentpar = (struct pvr2fb_par *)(fb_info + 1);
> +	currentpar = fb_info->par;
>  
>  	/* Make a guess at the monitor based on the attached cable */
>  	if (pvr2_init_cable() == CT_VGA) {
> @@ -665,7 +663,6 @@
>  
>  	fb_info->fbops		= &pvr2fb_ops;
>  	fb_info->fix		= pvr2_fix;
> -	fb_info->par		= currentpar;
>  	fb_info->pseudo_palette	= (void *)(fb_info->par + 1);
>  	fb_info->flags		= FBINFO_FLAG_DEFAULT;
>  
> @@ -723,7 +720,6 @@
>  	}
>  #endif
>  	unregister_framebuffer(fb_info);
> -	kfree(fb_info);
>  }
>  
>  static int __init pvr2_get_param(const struct pvr2_params *p, const char *s,
> 

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

      reply	other threads:[~2003-09-15 22:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-09-15 21:51 [PATCH] pvr2fb: New framebuffer_alloc API and class_dev changes Kronos
2003-09-15 22:06 ` Paul Mundt [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20030915220607.GA2708@linux-sh.org \
    --to=lethal@linux-sh.org \
    --cc=jsimmons@infradead.org \
    --cc=kronos@kronoz.cjb.net \
    --cc=linux-fbdev-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).