viafb: I2C/DDC LCD detection for VIA framebuffer
PATCH 1/1 viafb: I2C/DDC LCD detection for VIA framebuffer
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.
---
drivers/video/via/via-core.c +54 -0
@@ -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 <[email protected]> +* Copyright 2010 Dzianis Kahanovich <[email protected]> */ /*
@@ -16,6 +17,8 @@#include <linux/interrupt.h> #include <linux/platform_device.h> +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 ) +{ +const 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:
drivers/video/via/viafbdev.c +1 -1
@@ -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 ="" ;
--
Signature · 1 line
WBR, Dzianis Kahanovich AKA Denis Kaganovich, http://mahatma.bspu.unibel.by/
drivers/video/via/via-core.c static void via_teardown_subdevs(void) · line 583
Quoted 3 lines · Dzianis Kahanovich
drivers/video/via/via-core.c +3
-0+static void via_i2c_detect (void ) +{ +const u8 *edid;
^^^^^
drivers/video/via/via-core.c static void via_teardown_subdevs(void) · line 625
Quoted 2 lines
drivers/video/via/via-core.c +2
-0+free_edid: +kfree (edid);
^^^^^^^^^^^
That probably shouldn't be const.
drivers/video/via/via-core.c static void via_teardown_subdevs(void) · line 630
Quoted 6 lines
drivers/video/via/via-core.c +5
-0+if (n >1 ) +break ; + } +} +
regards,
dan carpenter
Sorry for mistake. I sure to remove "const" but revert to older code later. I repost fixed patch ("v2") to avoid formal problems. Sorry.
Quoted 23 lines · Dan Carpenter
drivers/video/via/via-core.c static void via_teardown_subdevs(void) · line 583
Quoted 3 lines · Dzianis Kahanovich
drivers/video/via/via-core.c +3
-0+static void via_i2c_detect (void ) +{ +const u8 *edid;^^^^^drivers/video/via/via-core.c static void via_teardown_subdevs(void) · line 625
Quoted 2 lines
drivers/video/via/via-core.c +2
-0+free_edid: +kfree (edid);^^^^^^^^^^^That probably shouldn't be const.
drivers/video/via/via-core.c static void via_teardown_subdevs(void) · line 630
Quoted 6 lines
drivers/video/via/via-core.c +5
-0+if (n >1 ) +break ; + } +} +regards,
dan carpenter
Signature · 1 line
WBR, Dzianis Kahanovich AKA Denis Kaganovich, http://mahatma.bspu.unibel.by/