lkml.org 
[lkml]   [2005]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: 2.6.14-rc1: oops during boot
From
Date
On Wed, 2005-09-14 at 05:17 +0800, Antonino A. Daplas wrote:
> Grant Wilson wrote:
> > 2.6.14-rc1 oops on boot as a result of the patch "nvidiafb: Fallback to
> > firmware EDID".
> >
> Thanks. Try this patch.
>
> Signed-off-by: Antonino Daplas <adaplas@pol.net>
> ---
>
> diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
> --- a/drivers/video/nvidia/nv_i2c.c
> +++ b/drivers/video/nvidia/nv_i2c.c
> @@ -209,10 +209,13 @@ int nvidia_probe_i2c_connector(struct fb
>
> if (!edid && conn == 1) {
> /* try to get from firmware */
> - edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
> - if (edid)
> - memcpy(edid, fb_firmware_edid(info->device),
> - EDID_LENGTH);
> + const u8 *e = fb_firmware_edid(info->device);
> +
> + if (e != NULL) {
> + edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
> + if (edid)
> + memcpy(edid, e, EDID_LENGTH);
> + }
> }
>
> if (out_edid)

The patch works and the machine now boots and runs without problems -
thank you.

Grant
--
Running Linux 2.6.14-rc1 on x86_64

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-09-13 23:46    [W:0.487 / U:0.032 seconds]
©2003-2011 Jasper Spaans. Advertise on this site