From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932386Ab0KWADS (ORCPT ); Mon, 22 Nov 2010 19:03:18 -0500 Received: from imta-38.everyone.net ([216.200.145.38]:59720 "EHLO imta-38.everyone.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932177Ab0KWADR (ORCPT ); Mon, 22 Nov 2010 19:03:17 -0500 X-Eon-Dm: dm0103 MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Message-Id: <20101122160259.57EE1AF9@resin17.mta.everyone.net> Date: Mon, 22 Nov 2010 16:02:59 -0800 From: "Denis Kaganovich" Reply-To: To: Cc: "Dan Carpenter" Subject: [PATCH v3+]viafb: I2C/DDC LCD detection for VIA framebuffer X-Eon-Sig: AQGpYklM6wSzy5x8tQEAAAAC,f11a2912a752d67949165fee81121b2d X-Originating-Ip: 81.30.81.200 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 suspectscore=10 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=6.0.2-1010190000 definitions=main-1011220187 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I2C/DDC LCD detection for VIA framebuffer Adding legacy I2C/DDC support for VIA framebuffer, used to fix LCD panel size and (if "via_active_dev" is empty default) force LCD detection. This solving at least defaults on Chrome9 video on HP mini 2133 notebook, but must be good in other cases, include double-LCD. Also forcing viafb_active_dev to NULL as bugfix. Signed-off-by: Dzianis Kahanovich --- diff -pruN a/drivers/video/via/via-core.c b/drivers/video/via/via-core.c --- a/drivers/video/via/via-core.c 2010-11-22 13:11:44.000000000 +0200 +++ b/drivers/video/via/via-core.c 2010-11-23 00:37:14.000000000 +0200 @@ -2,6 +2,7 @@ * Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved. * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved. * Copyright 2009 Jonathan Corbet + * Copyright 2010 Dzianis Kahanovich */ /* @@ -16,6 +17,8 @@ #include #include +extern char *viafb_active_dev; + /* * The default port config. */ @@ -576,6 +579,56 @@ static void via_teardown_subdevs(void) } +static void via_i2c_detect(void) +{ + u8 *edid; + struct fb_var_screeninfo var; + int i, n = 0; + struct i2c_adapter *adapter; + + for (i = 0; i < VIAFB_NUM_PORTS; i++) { + adapter = viafb_find_i2c_adapter(i); + if (!adapter || !adapter->algo_data || + !(edid = fb_ddc_read(adapter))) + continue; + if (fb_parse_edid(edid, &var)) + goto free_edid; + if (n) { + fb_edid_to_monspecs(edid, &viafbinfo1->monspecs); + viaparinfo->lvds_setting_info2->lcd_panel_hres = + var.xres; + viaparinfo->lvds_setting_info2->lcd_panel_vres = + var.yres; + if (!viafb_active_dev) { + viafb_SAMM_ON = STATE_ON; + if (viafbinfo1->monspecs.input & FB_DISP_DDI) + viafb_LCD2_ON = STATE_ON; + } + } else { + fb_edid_to_monspecs(edid, &viafbinfo->monspecs); + viaparinfo->lvds_setting_info->lcd_panel_hres = + var.xres; + viaparinfo->lvds_setting_info->lcd_panel_vres = + var.yres; + if (!viafb_active_dev) { + viafb_DVI_ON = + viaparinfo->tmds_setting_info-> + max_hres ? STATE_ON : STATE_OFF; + if (viafbinfo->monspecs.input & FB_DISP_DDI) { + viafb_DeviceStatus = LCD_Device; + viafb_primary_dev = LCD_Device; + viafb_LCD_ON = STATE_ON; + } + } + } + n++; +free_edid: + kfree(edid); + if (n > 1) + break; + } +} + static int __devinit via_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -607,6 +660,7 @@ static int __devinit via_pci_probe(struc ret = via_fb_pci_probe(&global_dev); if (ret) goto out_subdevs; + via_i2c_detect(); return 0; out_subdevs: diff -pruN a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c --- a/drivers/video/via/viafbdev.c 2010-11-22 13:11:44.000000000 +0200 +++ b/drivers/video/via/viafbdev.c 2010-11-22 13:59:07.000000000 +0200 @@ -43,7 +43,7 @@ static int viafb_second_size; static int viafb_accel = 1; /* Added for specifying active devices.*/ -char *viafb_active_dev; +char *viafb_active_dev = NULL; /*Added for specify lcd output port*/ char *viafb_lcd_port = ""; diff -pruN a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c --- a/drivers/video/via/via_i2c.c 2010-11-22 13:11:44.000000000 +0200 +++ b/drivers/video/via/via_i2c.c 2010-11-23 01:07:20.000000000 +0200 @@ -188,7 +188,7 @@ struct i2c_adapter *viafb_find_i2c_adapt { struct via_i2c_stuff *stuff = &via_i2c_par[which]; - return &stuff->adapter; + return stuff->is_active ? &stuff->adapter : NULL; } EXPORT_SYMBOL_GPL(viafb_find_i2c_adapter); -- PS Sorry for lamering. Bad webmail, home & bugfix...