shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk30 hdmi:

Browse Source 
1. modified according to fb commit 237ef417c9.
	2. rk30_sdk_defconfig support hdmi.
This commit is contained in:
Zheng Yang
2012-04-17 18:13:18 +08:00
parent 237ef417c9
commit 35db0faef7
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/configs/rk30_sdk_defconfig
View File

@@ -277,6 +277,7 @@ CONFIG_DISPLAY_SUPPORT=y
CONFIG_LCD_B101EW05=y
CONFIG_FB_ROCKCHIP=y
CONFIG_LCDC_RK30=y
CONFIG_HDMI_RK30=y
CONFIG_RGA_RK30=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set

20
drivers/video/rockchip/hdmi/rk30_hdmi_lcdc.c
View File

@@ -486,9 +486,6 @@ const char *hdmi_get_video_mode_name(unsigned char vic)
int hdmi_switch_fb(struct hdmi *hdmi, int vic)
{
int rc = 0;
struct layer_par *par = NULL;
struct rk_lcdc_device_driver * dev_drv;
struct rk29fb_screen *screen;
if(hdmi->vic == 0)
hdmi->vic = HDMI_VIDEO_DEFAULT_MODE;
@@ -498,18 +495,10 @@ int hdmi_switch_fb(struct hdmi *hdmi, int vic)
return -1;
}
dev_drv = hdmi->lcdc;
screen = dev_drv->screen;
rc = hdmi_set_info(hdmi->lcdc->screen, vic);
if(rc == 0 && hdmi->lcdc->load_screen) {
hdmi->lcdc->load_screen(hdmi->lcdc, 0);
par = dev_drv->layer_par[1];
par->xsize = screen->x_res;
par->ysize = screen->y_res;
hdmi->lcdc->set_par(hdmi->lcdc, 1);
hdmi->lcdc->pan_display(hdmi->lcdc, 1);
if(rc == 0) {
rk_fb_switch_screen(hdmi->lcdc->screen, 1, HDMI_SOURCE_DEFAULT);
}
return rc;
}
@@ -522,5 +511,8 @@ int hdmi_switch_fb(struct hdmi *hdmi, int vic)
*/
int hdmi_get_hotplug(void)
{
return hdmi->hotplug;
if(hdmi)
return hdmi->hotplug;
else
return HDMI_HPD_REMOVED;
}