Messages in this thread Patch in this message | | | Date | Fri, 4 Jun 2004 17:49:11 +0200 | From | Guido Guenther <> | Subject | Re: [Patch]: Fix rivafb's OF parsing |
| |
On Fri, Jun 04, 2004 at 08:40:21AM +1000, Benjamin Herrenschmidt wrote: > > the attached patch fixes the EDID parsing for PPC on rivafb. It actually > > finds the EDID info in the OF Tree now. I grabbed this from BenHs Tree as > > of 2.6.5-rc3. The current code has no chance to work since it doesn't > > walk the device tree. > > This helps rivafb on PPC at least a bit further... > > Cheers, > > Your tab/spacing seem to be broken.. Fix the tabs or check that your > mailer isn't screwing them up. Next try: signed-off-by: Guido Guenther <agx@sigxcpu.org>
--- 2.6/linux-2.6.7-rc2.orig/drivers/video/riva/fbdev.c 2004-06-04 17:40:30.842899312 +0200 +++ current/drivers/video/riva/fbdev.c 2004-06-04 15:38:00.136376560 +0200 @@ -1620,14 +1655,27 @@ struct riva_par *par = (struct riva_par *) info->par; struct device_node *dp; unsigned char *pedid = NULL; + unsigned char *disptype = NULL; + static char *propnames[] = { + "DFP,EDID", "LCD,EDID", "EDID", "EDID1", "EDID,B", "EDID,A", NULL }; + int i; dp = pci_device_to_OF_node(pd); - pedid = (unsigned char *)get_property(dp, "EDID,B", 0); - - if (pedid) { + for (; dp != NULL; dp = dp->child) { + disptype = (unsigned char *)get_property(dp, "display-type", NULL); + if (disptype == NULL) + continue; + if (strncmp(disptype, "LCD", 3) != 0) + continue; + for (i = 0; propnames[i] != NULL; ++i) { + pedid = (unsigned char *) + get_property(dp, propnames[i], NULL); + if (pedid != NULL) { par->EDID = pedid; return 1; - } else + } + } + } return 0; } #endif /* CONFIG_PPC_OF */ - 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/
| |