Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264858AbUFAETp (ORCPT ); Tue, 1 Jun 2004 00:19:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264877AbUFAETp (ORCPT ); Tue, 1 Jun 2004 00:19:45 -0400 Received: from honk1.physik.uni-konstanz.de ([134.34.140.224]:17876 "EHLO honk1.physik.uni-konstanz.de") by vger.kernel.org with ESMTP id S264858AbUFAETc (ORCPT ); Tue, 1 Jun 2004 00:19:32 -0400 Date: Tue, 1 Jun 2004 01:16:04 -0300 From: Guido Guenther To: linux-kernel Cc: Benjamin Herrenschmidt Subject: [Patch]: Fix rivafb's OF parsing Message-ID: <20040601041604.GA2344@bogon.ms20.nix> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Dxnq1zWXvFF0Q93v" Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.6i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2125 Lines: 62 --Dxnq1zWXvFF0Q93v Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi, 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, -- Guido signed-off-by: Guido G?nther --Dxnq1zWXvFF0Q93v Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="revert-rivafb-edid-changes.diff" --- ../linux-2.6.7-rc2.orig/drivers/video/riva/fbdev.c 2004-05-30 11:40:32.000000000 -0300 +++ drivers/video/riva/fbdev.c 2004-06-01 00:57:37.060599712 -0300 @@ -1620,14 +1632,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 */ --Dxnq1zWXvFF0Q93v-- - 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/