Re: [PATCH v7 6/8] Loongson: YeeLoong: add video output driver

[Wu Zhangjin]

Hi, Pavel

Can I get your Acked-by: for this patch?

Thanks!
	Wu Zhangjin

On Fri, 2009-12-04 at 21:36 +0800, Wu Zhangjin wrote:
> From: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
> 
> This patch adds Video Output Driver, it provides standard
> interface(/sys/class/video_output) to turn on/off the video output of
> LCD, CRT.
> 
> Signed-off-by: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
> ---
>  drivers/platform/mips/Kconfig           |    1 +
>  drivers/platform/mips/yeeloong_laptop.c |  147 +++++++++++++++++++++++++++++++
>  2 files changed, 148 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/platform/mips/Kconfig b/drivers/platform/mips/Kconfig
> index 9c8385c..4a89c01 100644
> --- a/drivers/platform/mips/Kconfig
> +++ b/drivers/platform/mips/Kconfig
> @@ -21,6 +21,7 @@ config LEMOTE_YEELOONG2F
>  	select SYS_SUPPORTS_APM_EMULATION
>  	select APM_EMULATION
>  	select HWMON
> +	select VIDEO_OUTPUT_CONTROL
>  	default m
>  	help
>  	  YeeLoong netbook is a mini laptop made by Lemote, which is basically
> diff --git a/drivers/platform/mips/yeeloong_laptop.c b/drivers/platform/mips/yeeloong_laptop.c
> index 644aaa7..8378926 100644
> --- a/drivers/platform/mips/yeeloong_laptop.c
> +++ b/drivers/platform/mips/yeeloong_laptop.c
> @@ -16,6 +16,7 @@
>  #include <linux/apm-emulation.h>/* for battery subdriver */
>  #include <linux/hwmon.h>	/* for hwmon subdriver */
>  #include <linux/hwmon-sysfs.h>
> +#include <linux/video_output.h>	/* for video output subdriver */
>  
>  #include <ec_kb3310b.h>
>  
> @@ -397,6 +398,144 @@ static void yeeloong_hwmon_exit(void)
>  	}
>  }
>  
> +/* video output subdriver */
> +
> +static int lcd_video_output_get(struct output_device *od)
> +{
> +	return ec_read(REG_DISPLAY_LCD);
> +}
> +
> +static int lcd_video_output_set(struct output_device *od)
> +{
> +	int value;
> +	unsigned long status;
> +
> +	status = !!od->request_state;
> +
> +	if (status == BIT_DISPLAY_LCD_ON) {
> +		/* Turn on LCD */
> +		outb(0x31, 0x3c4);
> +		value = inb(0x3c5);
> +		value = (value & 0xf8) | 0x03;
> +		outb(0x31, 0x3c4);
> +		outb(value, 0x3c5);
> +		/* Turn on backlight */
> +		ec_write(REG_BACKLIGHT_CTRL, BIT_BACKLIGHT_ON);
> +	} else {
> +		/* Turn off backlight */
> +		ec_write(REG_BACKLIGHT_CTRL, BIT_BACKLIGHT_OFF);
> +		/* Turn off LCD */
> +		outb(0x31, 0x3c4);
> +		value = inb(0x3c5);
> +		value = (value & 0xf8) | 0x02;
> +		outb(0x31, 0x3c4);
> +		outb(value, 0x3c5);
> +	}
> +
> +	return 0;
> +}
> +
> +static struct output_properties lcd_output_properties = {
> +	.set_state = lcd_video_output_set,
> +	.get_status = lcd_video_output_get,
> +};
> +
> +static int crt_video_output_get(struct output_device *od)
> +{
> +	return ec_read(REG_CRT_DETECT);
> +}
> +
> +static int crt_video_output_set(struct output_device *od)
> +{
> +	int value;
> +	unsigned long status;
> +
> +	status = !!od->request_state;
> +
> +	if (status == BIT_CRT_DETECT_PLUG) {
> +		if (ec_read(REG_CRT_DETECT) == BIT_CRT_DETECT_PLUG) {
> +			/* Turn on CRT */
> +			outb(0x21, 0x3c4);
> +			value = inb(0x3c5);
> +			value &= ~(1 << 7);
> +			outb(0x21, 0x3c4);
> +			outb(value, 0x3c5);
> +		}
> +	} else {
> +		/* Turn off CRT */
> +		outb(0x21, 0x3c4);
> +		value = inb(0x3c5);
> +		value |= (1 << 7);
> +		outb(0x21, 0x3c4);
> +		outb(value, 0x3c5);
> +	}
> +
> +	return 0;
> +}
> +
> +static struct output_properties crt_output_properties = {
> +	.set_state = crt_video_output_set,
> +	.get_status = crt_video_output_get,
> +};
> +
> +static struct output_device *lcd_output_dev, *crt_output_dev;
> +
> +static void yeeloong_lcd_vo_set(int status)
> +{
> +	lcd_output_dev->request_state = status;
> +	lcd_video_output_set(lcd_output_dev);
> +}
> +
> +static void yeeloong_crt_vo_set(int status)
> +{
> +	crt_output_dev->request_state = status;
> +	crt_video_output_set(crt_output_dev);
> +}
> +
> +static int yeeloong_vo_init(void)
> +{
> +	int ret;
> +
> +	/* Register video output device: lcd, crt */
> +	lcd_output_dev = video_output_register("LCD", NULL, NULL,
> +			&lcd_output_properties);
> +
> +	if (IS_ERR(lcd_output_dev)) {
> +		ret = PTR_ERR(lcd_output_dev);
> +		lcd_output_dev = NULL;
> +		return ret;
> +	}
> +	/* Ensure LCD is on by default */
> +	yeeloong_lcd_vo_set(BIT_DISPLAY_LCD_ON);
> +
> +	crt_output_dev = video_output_register("CRT", NULL, NULL,
> +			&crt_output_properties);
> +
> +	if (IS_ERR(crt_output_dev)) {
> +		ret = PTR_ERR(crt_output_dev);
> +		crt_output_dev = NULL;
> +		return ret;
> +	}
> +
> +	/* Turn off CRT by default, and will be enabled when the CRT
> +	 * connectting event reported by SCI */
> +	yeeloong_crt_vo_set(BIT_CRT_DETECT_UNPLUG);
> +
> +	return 0;
> +}
> +
> +static void yeeloong_vo_exit(void)
> +{
> +	if (lcd_output_dev) {
> +		video_output_unregister(lcd_output_dev);
> +		lcd_output_dev = NULL;
> +	}
> +	if (crt_output_dev) {
> +		video_output_unregister(crt_output_dev);
> +		crt_output_dev = NULL;
> +	}
> +}
> +
>  static struct platform_device_id platform_device_ids[] = {
>  	{
>  		.name = "yeeloong_laptop",
> @@ -443,11 +582,19 @@ static int __init yeeloong_init(void)
>  		return ret;
>  	}
>  
> +	ret = yeeloong_vo_init();
> +	if (ret) {
> +		pr_err("Fail to register yeeloong video output driver.\n");
> +		yeeloong_vo_exit();
> +		return ret;
> +	}
> +
>  	return 0;
>  }
>  
>  static void __exit yeeloong_exit(void)
>  {
> +	yeeloong_vo_exit();
>  	yeeloong_hwmon_exit();
>  	yeeloong_battery_exit();
>  	yeeloong_backlight_exit();


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/