Commit acff987d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 

* 'fbdev-next' of git://github.com/schandinat/linux-2.6: (270 commits)
  video: platinumfb: Add __devexit_p at necessary place
  drivers/video: fsl-diu-fb: merge diu_pool into fsl_diu_data
  drivers/video: fsl-diu-fb: merge diu_hw into fsl_diu_data
  drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
  drivers/video: fsl-diu-fb: remove unused panel operating mode support
  drivers/video: fsl-diu-fb: use an enum for the AOI index
  drivers/video: fsl-diu-fb: add several new video modes
  drivers/video: fsl-diu-fb: remove broken screen blanking support
  drivers/video: fsl-diu-fb: move some definitions out of the header file
  drivers/video: fsl-diu-fb: fix some ioctls
  video: da8xx-fb: Increased resolution configuration of revised LCDC IP
  OMAPDSS: picodlp: add missing #include <linux/module.h>
  fb: fix au1100fb bitrot.
  mx3fb: fix NULL pointer dereference in screen blanking.
  video: irq: Remove IRQF_DISABLED
  smscufx: change edid data to u8 instead of char
  OMAPDSS: DISPC: zorder support for DSS overlays
  OMAPDSS: DISPC: VIDEO3 pipeline support
  OMAPDSS/OMAP_VOUT: Fix incorrect OMAP3-alpha compatibility setting
  video/omap: fix build dependencies
  ...

Fix up conflicts in:
 - drivers/staging/xgifb/XGI_main_26.c
	Changes to XGIfb_pan_var()
 - drivers/video/omap/{lcd_apollon.c,lcd_ldp.c,lcd_overo.c}
	Removed (or in the case of apollon.c, merged into the generic
	DSS panel in drivers/video/omap2/displays/panel-generic-dpi.c)
parents ce949717 b57287ba

Documentation/fb/udlfb.txt

+27 −12
Original line number Diff line number Diff line
@@ -87,23 +87,38 @@ Special configuration for udlfb is usually unnecessary. There are a few 
options, however.



From the command line, pass options to modprobe

modprobe udlfb defio=1 console=1

modprobe udlfb fb_defio=0 console=1 shadow=1



Or for permanent option, create file like /etc/modprobe.d/options with text

options udlfb defio=1 console=1

Or modify options on the fly at /sys/module/udlfb/parameters directory via

sudo nano fb_defio

change the parameter in place, and save the file.



Accepted options:

Unplug/replug USB device to apply with new settings



Or for permanent option, create file like /etc/modprobe.d/udlfb.conf with text

options udlfb fb_defio=0 console=1 shadow=1



Accepted boolean options:



fb_defio	Make use of the fb_defio (CONFIG_FB_DEFERRED_IO) kernel

		module to track changed areas of the framebuffer by page faults.

		Standard fbdev applications that use mmap but that do not

		report damage, may be able to work with this enabled.

		Disabled by default because of overhead and other issues.



console		Allow fbcon to attach to udlfb provided framebuffers. This

		is disabled by default because fbcon will aggressively consume

		the first framebuffer it finds, which isn't usually what the

		user wants in the case of USB displays.

		report damage, should be able to work with this enabled.

		Disable when running with X server that supports reporting

		changed regions via ioctl, as this method is simpler,

		more stable, and higher performance.

		default: fb_defio=1



console	Allow fbcon to attach to udlfb provided framebuffers.

		Can be disabled if fbcon and other clients

		(e.g. X with --shared-vt) are in conflict.

		default: console=1



shadow		Allocate a 2nd framebuffer to shadow what's currently across

		the USB bus in device memory. If any pixels are unchanged,

		do not transmit. Spends host memory to save USB transfers.

		Enabled by default. Only disable on very low memory systems.

		default: shadow=1



Sysfs Attributes

================

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -5970,6 +5970,12 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/ethernet/smsc/smsc9420.*



SMSC UFX6000 and UFX7000 USB to VGA DRIVER

M:	Steve Glendinning <steve.glendinning@smsc.com>

L:	linux-fbdev@vger.kernel.org

S:	Supported

F:	drivers/video/smscufx.c



SN-IA64 (Itanium) SUB-PLATFORM

M:	Jes Sorensen <jes@sgi.com>

L:	linux-altix@sgi.com

arch/arm/mach-omap2/board-2430sdp.c

+64 −14
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ 
#include <plat/usb.h>

#include <plat/gpmc-smc91x.h>



#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>



#include "mux.h"

#include "hsmmc.h"

#include "common-board-devices.h"
@@ -99,20 +102,72 @@ static struct platform_device sdp2430_flash_device = { 
	.resource	= &sdp2430_flash_resource,

};



static struct platform_device sdp2430_lcd_device = {

	.name		= "sdp2430_lcd",

	.id		= -1,

};



static struct platform_device *sdp2430_devices[] __initdata = {

	&sdp2430_flash_device,

};



/* LCD */

#define SDP2430_LCD_PANEL_BACKLIGHT_GPIO	91

#define SDP2430_LCD_PANEL_ENABLE_GPIO		154



static int sdp2430_panel_enable_lcd(struct omap_dss_device *dssdev)

{

	gpio_direction_output(SDP2430_LCD_PANEL_ENABLE_GPIO, 1);

	gpio_direction_output(SDP2430_LCD_PANEL_BACKLIGHT_GPIO, 1);



	return 0;

}



static void sdp2430_panel_disable_lcd(struct omap_dss_device *dssdev)

{

	gpio_direction_output(SDP2430_LCD_PANEL_ENABLE_GPIO, 0);

	gpio_direction_output(SDP2430_LCD_PANEL_BACKLIGHT_GPIO, 0);

}



static struct panel_generic_dpi_data sdp2430_panel_data = {

	.name			= "nec_nl2432dr22-11b",

	.platform_enable	= sdp2430_panel_enable_lcd,

	.platform_disable	= sdp2430_panel_disable_lcd,

};



static struct omap_dss_device sdp2430_lcd_device = {

	.name			= "lcd",

	.driver_name		= "generic_dpi_panel",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.phy.dpi.data_lines	= 16,

	.data			= &sdp2430_panel_data,

};



static struct omap_dss_device *sdp2430_dss_devices[] = {

	&sdp2430_lcd_device,

};



static struct omap_lcd_config sdp2430_lcd_config __initdata = {

	.ctrl_name	= "internal",

static struct omap_dss_board_info sdp2430_dss_data = {

	.num_devices	= ARRAY_SIZE(sdp2430_dss_devices),

	.devices	= sdp2430_dss_devices,

	.default_device	= &sdp2430_lcd_device,

};



static void __init sdp2430_display_init(void)

{

	int r;



	static struct gpio gpios[] __initdata = {

		{ SDP2430_LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,

			"LCD reset" },

		{ SDP2430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW,

			"LCD Backlight" },

	};



	r = gpio_request_array(gpios, ARRAY_SIZE(gpios));

	if (r) {

		pr_err("Cannot request LCD GPIOs, error %d\n", r);

		return;

	}



	omap_display_init(&sdp2430_dss_data);

}



#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)



static struct omap_smc91x_platform_data board_smc91x_data = {
@@ -137,10 +192,6 @@ static inline void board_smc91x_init(void) 


#endif



static struct omap_board_config_kernel sdp2430_config[] __initdata = {

	{OMAP_TAG_LCD, &sdp2430_lcd_config},

};



static void __init omap_2430sdp_init_early(void)

{

	omap2_init_common_infrastructure();
@@ -229,9 +280,6 @@ static void __init omap_2430sdp_init(void) 
{

	omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);



	omap_board_config = sdp2430_config;

	omap_board_config_size = ARRAY_SIZE(sdp2430_config);



	omap2430_i2c_init();



	platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices));
@@ -247,6 +295,8 @@ static void __init omap_2430sdp_init(void) 
	/* Turn off secondary LCD backlight */

	gpio_request_one(SECONDARY_LCD_GPIO, GPIOF_OUT_INIT_LOW,

			 "Secondary LCD backlight");



	sdp2430_display_init();

}



static void __init omap_2430sdp_map_io(void)

arch/arm/mach-omap2/board-3430sdp.c

+3 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <plat/dma.h>

#include <plat/gpmc.h>

#include <video/omapdss.h>

#include <video/omap-panel-generic-dpi.h>

#include <video/omap-panel-dvi.h>



#include <plat/gpmc-smc91x.h>
@@ -186,8 +186,7 @@ static struct omap_dss_device sdp3430_lcd_device = { 
	.platform_disable	= sdp3430_panel_disable_lcd,

};



static struct panel_generic_dpi_data dvi_panel = {

	.name			= "generic",

static struct panel_dvi_platform_data dvi_panel = {

	.platform_enable	= sdp3430_panel_enable_dvi,

	.platform_disable	= sdp3430_panel_disable_dvi,

};
@@ -195,7 +194,7 @@ static struct panel_generic_dpi_data dvi_panel = { 
static struct omap_dss_device sdp3430_dvi_device = {

	.name			= "dvi",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.driver_name		= "generic_dpi_panel",

	.driver_name		= "dvi",

	.data			= &dvi_panel,

	.phy.dpi.data_lines	= 24,

};

arch/arm/mach-omap2/board-4430sdp.c

+180 −28
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
#include <plat/mmc.h>

#include <plat/omap4-keypad.h>

#include <video/omapdss.h>

#include <video/omap-panel-nokia-dsi.h>

#include <video/omap-panel-picodlp.h>

#include <linux/wl12xx.h>



#include "mux.h"
@@ -52,6 +54,8 @@ 
#define OMAP4_SFH7741_ENABLE_GPIO		188

#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */

#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */

#define DISPLAY_SEL_GPIO	59	/* LCD2/PicoDLP switch */

#define DLP_POWER_ON_GPIO	40



#define GPIO_WIFI_PMENA		54

#define GPIO_WIFI_IRQ		53
@@ -340,11 +344,6 @@ static int __init omap_ethernet_init(void) 
	return status;

}



static struct platform_device sdp4430_lcd_device = {

	.name		= "sdp4430_lcd",

	.id		= -1,

};



static struct regulator_consumer_supply sdp4430_vbat_supply[] = {

	REGULATOR_SUPPLY("vddvibl", "twl6040-vibra"),

	REGULATOR_SUPPLY("vddvibr", "twl6040-vibra"),
@@ -374,21 +373,12 @@ static struct platform_device sdp4430_vbat = { 
};



static struct platform_device *sdp4430_devices[] __initdata = {

	&sdp4430_lcd_device,

	&sdp4430_gpio_keys_device,

	&sdp4430_leds_gpio,

	&sdp4430_leds_pwm,

	&sdp4430_vbat,

};



static struct omap_lcd_config sdp4430_lcd_config __initdata = {

	.ctrl_name	= "internal",

};



static struct omap_board_config_kernel sdp4430_config[] __initdata = {

	{ OMAP_TAG_LCD,		&sdp4430_lcd_config },

};



static void __init omap_4430sdp_init_early(void)

{

	omap2_init_common_infrastructure();
@@ -648,37 +638,202 @@ static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev) 
	gpio_free(HDMI_GPIO_HPD);

}



static struct omap_dss_device sdp4430_hdmi_device = {

	.name = "hdmi",

	.driver_name = "hdmi_panel",

	.type = OMAP_DISPLAY_TYPE_HDMI,

static struct nokia_dsi_panel_data dsi1_panel = {

		.name		= "taal",

		.reset_gpio	= 102,

		.use_ext_te	= false,

		.ext_te_gpio	= 101,

		.esd_interval	= 0,

};



static struct omap_dss_device sdp4430_lcd_device = {

	.name			= "lcd",

	.driver_name		= "taal",

	.type			= OMAP_DISPLAY_TYPE_DSI,

	.data			= &dsi1_panel,

	.phy.dsi		= {

		.clk_lane	= 1,

		.clk_pol	= 0,

		.data1_lane	= 2,

		.data1_pol	= 0,

		.data2_lane	= 3,

		.data2_pol	= 0,



		.module		= 0,

	},



	.clocks = {

		.dispc = {

			.channel = {

				/* Logic Clock = 172.8 MHz */

				.lck_div	= 1,

				/* Pixel Clock = 34.56 MHz */

				.pck_div	= 5,

				.lcd_clk_src	= OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC,

			},

			.dispc_fclk_src	= OMAP_DSS_CLK_SRC_FCK,

		},



		.dsi = {

			.regn		= 16,	/* Fint = 2.4 MHz */

			.regm		= 180,	/* DDR Clock = 216 MHz */

			.regm_dispc	= 5,	/* PLL1_CLK1 = 172.8 MHz */

			.regm_dsi	= 5,	/* PLL1_CLK2 = 172.8 MHz */



			.lp_clk_div	= 10,	/* LP Clock = 8.64 MHz */

			.dsi_fclk_src	= OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI,

		},

	},

	.channel		= OMAP_DSS_CHANNEL_LCD,

};



static struct nokia_dsi_panel_data dsi2_panel = {

		.name		= "taal",

		.reset_gpio	= 104,

		.use_ext_te	= false,

		.ext_te_gpio	= 103,

		.esd_interval	= 0,

};



static struct omap_dss_device sdp4430_lcd2_device = {

	.name			= "lcd2",

	.driver_name		= "taal",

	.type			= OMAP_DISPLAY_TYPE_DSI,

	.data			= &dsi2_panel,

	.phy.dsi		= {

		.clk_lane	= 1,

		.clk_pol	= 0,

		.data1_lane	= 2,

		.data1_pol	= 0,

		.data2_lane	= 3,

		.data2_pol	= 0,



		.module		= 1,

	},



	.clocks = {

		.dispc = {

			.channel = {

				/* Logic Clock = 172.8 MHz */

				.lck_div	= 1,

				/* Pixel Clock = 34.56 MHz */

				.pck_div	= 5,

				.lcd_clk_src	= OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC,

			},

			.dispc_fclk_src	= OMAP_DSS_CLK_SRC_FCK,

		},

		.hdmi	= {

			.regn	= 15,

			.regm2	= 1,



		.dsi = {

			.regn		= 16,	/* Fint = 2.4 MHz */

			.regm		= 180,	/* DDR Clock = 216 MHz */

			.regm_dispc	= 5,	/* PLL1_CLK1 = 172.8 MHz */

			.regm_dsi	= 5,	/* PLL1_CLK2 = 172.8 MHz */



			.lp_clk_div	= 10,	/* LP Clock = 8.64 MHz */

			.dsi_fclk_src	= OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI,

		},

	},

	.channel		= OMAP_DSS_CHANNEL_LCD2,

};



static void sdp4430_lcd_init(void)

{

	int r;



	r = gpio_request_one(dsi1_panel.reset_gpio, GPIOF_DIR_OUT,

		"lcd1_reset_gpio");

	if (r)

		pr_err("%s: Could not get lcd1_reset_gpio\n", __func__);



	r = gpio_request_one(dsi2_panel.reset_gpio, GPIOF_DIR_OUT,

		"lcd2_reset_gpio");

	if (r)

		pr_err("%s: Could not get lcd2_reset_gpio\n", __func__);

}



static struct omap_dss_device sdp4430_hdmi_device = {

	.name = "hdmi",

	.driver_name = "hdmi_panel",

	.type = OMAP_DISPLAY_TYPE_HDMI,

	.platform_enable = sdp4430_panel_enable_hdmi,

	.platform_disable = sdp4430_panel_disable_hdmi,

	.channel = OMAP_DSS_CHANNEL_DIGIT,

};



static struct picodlp_panel_data sdp4430_picodlp_pdata = {

	.picodlp_adapter_id	= 2,

	.emu_done_gpio		= 44,

	.pwrgood_gpio		= 45,

};



static void sdp4430_picodlp_init(void)

{

	int r;

	const struct gpio picodlp_gpios[] = {

		{DLP_POWER_ON_GPIO, GPIOF_OUT_INIT_LOW,

			"DLP POWER ON"},

		{sdp4430_picodlp_pdata.emu_done_gpio, GPIOF_IN,

			"DLP EMU DONE"},

		{sdp4430_picodlp_pdata.pwrgood_gpio, GPIOF_OUT_INIT_LOW,

			"DLP PWRGOOD"},

	};



	r = gpio_request_array(picodlp_gpios, ARRAY_SIZE(picodlp_gpios));

	if (r)

		pr_err("Cannot request PicoDLP GPIOs, error %d\n", r);

}



static int sdp4430_panel_enable_picodlp(struct omap_dss_device *dssdev)

{

	gpio_set_value(DISPLAY_SEL_GPIO, 0);

	gpio_set_value(DLP_POWER_ON_GPIO, 1);



	return 0;

}



static void sdp4430_panel_disable_picodlp(struct omap_dss_device *dssdev)

{

	gpio_set_value(DLP_POWER_ON_GPIO, 0);

	gpio_set_value(DISPLAY_SEL_GPIO, 1);

}



static struct omap_dss_device sdp4430_picodlp_device = {

	.name			= "picodlp",

	.driver_name		= "picodlp_panel",

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.phy.dpi.data_lines	= 24,

	.channel		= OMAP_DSS_CHANNEL_LCD2,

	.platform_enable	= sdp4430_panel_enable_picodlp,

	.platform_disable	= sdp4430_panel_disable_picodlp,

	.data			= &sdp4430_picodlp_pdata,

};



static struct omap_dss_device *sdp4430_dss_devices[] = {

	&sdp4430_lcd_device,

	&sdp4430_lcd2_device,

	&sdp4430_hdmi_device,

	&sdp4430_picodlp_device,

};



static struct omap_dss_board_info sdp4430_dss_data = {

	.num_devices	= ARRAY_SIZE(sdp4430_dss_devices),

	.devices	= sdp4430_dss_devices,

	.default_device	= &sdp4430_hdmi_device,

	.default_device	= &sdp4430_lcd_device,

};



void omap_4430sdp_display_init(void)

static void omap_4430sdp_display_init(void)

{

	int r;



	/* Enable LCD2 by default (instead of Pico DLP) */

	r = gpio_request_one(DISPLAY_SEL_GPIO, GPIOF_OUT_INIT_HIGH,

			"display_sel");

	if (r)

		pr_err("%s: Could not get display_sel GPIO\n", __func__);



	sdp4430_lcd_init();

	sdp4430_hdmi_mux_init();

	sdp4430_picodlp_init();

	omap_display_init(&sdp4430_dss_data);

}
@@ -802,9 +957,6 @@ static void __init omap_4430sdp_init(void) 
		package = OMAP_PACKAGE_CBL;

	omap4_mux_init(board_mux, NULL, package);



	omap_board_config = sdp4430_config;

	omap_board_config_size = ARRAY_SIZE(sdp4430_config);



	omap4_i2c_init();

	omap_sfh7741prox_init();

	platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));

CRA Git | Maintained and supported by SUSTech CRA and CCSE