From patchwork Mon Dec 20 19:43:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzianis Kahanovich X-Patchwork-Id: 422201 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBL0RA98011307 for ; Tue, 21 Dec 2010 00:31:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932730Ab0LTTmR (ORCPT ); Mon, 20 Dec 2010 14:42:17 -0500 Received: from mail.bspu.unibel.by ([195.50.2.21]:37454 "EHLO mail.bspu.local" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932601Ab0LTTmQ (ORCPT ); Mon, 20 Dec 2010 14:42:16 -0500 Received: from [10.200.200.1] ([10.200.200.1]) by mail.bspu.local (8.14.4/8.14.4) with ESMTP id oBKJg4JZ003988; Mon, 20 Dec 2010 21:42:10 +0200 Message-ID: <4D0FB1D2.9050303@bspu.unibel.by> Date: Mon, 20 Dec 2010 21:43:14 +0200 From: Dzianis Kahanovich Reply-To: mahatma@eu.by User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:2.0b7pre) Gecko/20101123 Firefox/4.0b7pre SeaMonkey/2.1b1 MIME-Version: 1.0 To: Florian Tobias Schandinat CC: Paul Mundt , Joseph Chan , linux-fbdev@vger.kernel.org Subject: [PATCH v4/cleanup] viafb: I2C/DDC legacy & detect output device if viafb_active_dev unset References: <4CED3DD5.5080405@bspu.unibel.by> <20101130061357.GE17114@linux-sh.org> <4CF8DA25.4020204@bspu.unibel.by> <4CF9879A.3090409@gmx.de> <4D00D508.1060106@bspu.unibel.by> <4D03E177.6060305@gmx.de> In-Reply-To: <4D03E177.6060305@gmx.de> X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.bspu.local Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Dec 2010 00:31:09 +0000 (UTC) --- a/drivers/video/via/viafbdev.c 2010-12-18 06:42:37.000000000 +0200 +++ b/drivers/video/via/viafbdev.c 2010-12-20 20:17:42.000000000 +0200 @@ -1670,6 +1670,119 @@ static int parse_mode(const char *str, u return 0; } +/* Add devices, detected only via i2c legacy. + Really there may be CRT too, but unless I got no CRT DDC - LCD only. + Possible CRT may be found as "unknown" to keep CRT ON. + Set LCD/DVI/CRT if viafb_active_dev unset. */ +static void viafb_detect_dev(struct viafb_dev *vdev) +{ + u8 *edid; + struct fb_var_screeninfo var; + int i, t, ndev = 0, nlcd = 0, unknown = 0; + struct i2c_adapter *adapter; + struct lvds_setting_information *inf; + + /* FIXME: viaparinfo1->chip_info looks equal to viaparinfo */ + if (viaparinfo->chip_info->tmds_chip_info.tmds_chip_name) { + ndev++; + if (!viafb_active_dev) + viafb_DVI_ON = STATE_ON; + } + if (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name) { + ndev++; + nlcd = 1; + if (!viafb_active_dev) + viafb_LCD_ON = STATE_ON; + } + if (viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name) { + ndev++; + nlcd = 2; + if (!viafb_active_dev) + viafb_LCD2_ON = STATE_ON; + } + /* enabling CRT in textmode is at least no bad */ + if (viafb_CRT_ON) { + ndev++; + viafb_crt_enable(); + } + for (i = 0; i < VIAFB_NUM_PORTS; i++) { + t = vdev->port_cfg[i].type; + /* detect only i2c ports, undetected in other places */ + if ((viaparinfo && viaparinfo->chip_info && ( + (viaparinfo->chip_info->tmds_chip_info.tmds_chip_name && + viaparinfo->chip_info->tmds_chip_info.i2c_port == t) || + (viaparinfo->chip_info->lvds_chip_info.lvds_chip_name && + viaparinfo->chip_info->lvds_chip_info.i2c_port == t) || + (viaparinfo->chip_info->lvds_chip_info2.lvds_chip_name && + viaparinfo->chip_info->lvds_chip_info2.i2c_port == t) + )) || (viaparinfo1 && viaparinfo1->chip_info && ( + (viaparinfo1->chip_info->tmds_chip_info.tmds_chip_name && + viaparinfo1->chip_info->tmds_chip_info.i2c_port == t) || + (viaparinfo1->chip_info->lvds_chip_info.lvds_chip_name && + viaparinfo1->chip_info->lvds_chip_info.i2c_port == t) || + (viaparinfo1->chip_info->lvds_chip_info2.lvds_chip_name && + viaparinfo1->chip_info->lvds_chip_info2.i2c_port == t) + )) || !(adapter = viafb_find_i2c_adapter(i)) || + !(edid = fb_ddc_read(adapter))) + continue; + memset(&var, 0, sizeof(var)); + if (fb_parse_edid(edid, &var)) + goto free_edid; + printk(KERN_INFO "viafb: %48s\n", adapter->name); + inf = NULL; + if (!nlcd) { + fb_edid_to_monspecs(edid, &viafbinfo->monspecs); + if (viafbinfo->monspecs.input & FB_DISP_DDI) + inf = viaparinfo->lvds_setting_info; + else + unknown++; + } else if (nlcd > 1) { + printk(KERN_ERR "viafb: too many LCD\n"); + unknown++; + } else if (viafb_dual_fb) { + fb_edid_to_monspecs(edid, &viafbinfo1->monspecs); + if (viafbinfo1->monspecs.input & FB_DISP_DDI) + inf = viaparinfo1->lvds_setting_info; + else + unknown++; + } else { + fb_edid_to_monspecs(edid, &viafbinfo->monspecs); + if (viafbinfo->monspecs.input & FB_DISP_DDI) + inf = viaparinfo->lvds_setting_info2; + else + unknown++; + } + if (inf) { + if (!viafb_active_dev) { + if (nlcd) + viafb_LCD2_ON = STATE_ON; + else + viafb_LCD_ON = STATE_ON; + } + nlcd++; + if (var.xres) + inf->lcd_panel_hres = var.xres; + if (var.yres) + inf->lcd_panel_vres = var.yres; + } + ndev++; +free_edid: + kfree(edid); + } + if (!viafb_active_dev) { + /* prefer CRT OFF if other devices */ + if (!unknown && ndev > 1) { + viafb_CRT_ON = STATE_OFF; + viafb_crt_disable(); + } + viafb_DeviceStatus = viafb_primary_dev = + viafb_CRT_ON ? CRT_Device : + viafb_DVI_ON ? DVI_Device : + viafb_LCD_ON ? LCD_Device : None_Device; + viafb_set_iga_path(); + } +} + #ifdef CONFIG_PM static int viafb_suspend(void *unused) @@ -1891,6 +2004,7 @@ int __devinit via_fb_pci_probe(struct vi viafb_init_proc(viaparinfo->shared); viafb_init_dac(IGA2); + viafb_detect_dev(vdev); #ifdef CONFIG_PM viafb_pm_register(&viafb_fb_pm_hooks);