V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

sunxi: video: Prepare for lcd support 

Refactor sunxi_mode_set into a bunch of helpers, and make it do a switch
case on sunxi_display.monitor to decide what to do.

Also rename sunxi_lcdc_mode_set to sunxi_lcdc_tcon1_mode_set, as it sets the
timings for tcon1, and for lcd support we need a similar function operating
on tcon0.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Hans de Goede 2014-12-21 14:49:34 +01:00
parent 1c092205a2
commit 0e04521557
1 changed files with 70 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
drivers/video/sunxi_display.c
View File

@ -311,6 +311,15 @@ static void sunxi_composer_mode_set(const struct ctfb_res_modes *mode,
setbits_le32(&de_be->mode, SUNXI_DE_BE_MODE_LAYER0_ENABLE); setbits_le32(&de_be->mode, SUNXI_DE_BE_MODE_LAYER0_ENABLE);
} }
static void sunxi_composer_enable(void)
{
struct sunxi_de_be_reg * const de_be =
(struct sunxi_de_be_reg *)SUNXI_DE_BE0_BASE;
setbits_le32(&de_be->reg_ctrl, SUNXI_DE_BE_REG_CTRL_LOAD_REGS);
setbits_le32(&de_be->mode, SUNXI_DE_BE_MODE_START);
}
/* /*
* LCDC, what allwinner calls a CRTC, so timing controller and serializer. * LCDC, what allwinner calls a CRTC, so timing controller and serializer.
*/ */
@ -401,8 +410,16 @@ static void sunxi_lcdc_init(void)
writel(0xffffffff, &lcdc->tcon1_io_tristate); writel(0xffffffff, &lcdc->tcon1_io_tristate);
} }
static void sunxi_lcdc_mode_set(const struct ctfb_res_modes *mode, static void sunxi_lcdc_enable(void)
int *clk_div, int *clk_double) {
struct sunxi_lcdc_reg * const lcdc =
(struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
setbits_le32(&lcdc->ctrl, SUNXI_LCDC_CTRL_TCON_ENABLE);
}
static void sunxi_lcdc_tcon1_mode_set(const struct ctfb_res_modes *mode,
int *clk_div, int *clk_double)
{ {
struct sunxi_lcdc_reg * const lcdc = struct sunxi_lcdc_reg * const lcdc =
(struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE; (struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE;
@ -550,6 +567,15 @@ static void sunxi_hdmi_mode_set(const struct ctfb_res_modes *mode,
setbits_le32(&hdmi->video_polarity, SUNXI_HDMI_VIDEO_POL_VER); setbits_le32(&hdmi->video_polarity, SUNXI_HDMI_VIDEO_POL_VER);
} }
static void sunxi_hdmi_enable(void)
{
struct sunxi_hdmi_reg * const hdmi =
(struct sunxi_hdmi_reg *)SUNXI_HDMI_BASE;
udelay(100);
setbits_le32(&hdmi->video_ctrl, SUNXI_HDMI_VIDEO_CTRL_ENABLE);
}
static void sunxi_engines_init(void) static void sunxi_engines_init(void)
{ {
sunxi_composer_init(); sunxi_composer_init();
@ -562,25 +588,26 @@ static void sunxi_engines_init(void)
static void sunxi_mode_set(const struct ctfb_res_modes *mode, static void sunxi_mode_set(const struct ctfb_res_modes *mode,
unsigned int address) unsigned int address)
{ {
struct sunxi_de_be_reg * const de_be = switch (sunxi_display.monitor) {
(struct sunxi_de_be_reg *)SUNXI_DE_BE0_BASE; case sunxi_monitor_none:
struct sunxi_lcdc_reg * const lcdc = break;
(struct sunxi_lcdc_reg *)SUNXI_LCD0_BASE; case sunxi_monitor_dvi:
struct sunxi_hdmi_reg * const hdmi = case sunxi_monitor_hdmi: {
(struct sunxi_hdmi_reg *)SUNXI_HDMI_BASE; int clk_div, clk_double;
int clk_div, clk_double; sunxi_composer_mode_set(mode, address);
sunxi_lcdc_tcon1_mode_set(mode, &clk_div, &clk_double);
sunxi_composer_mode_set(mode, address); sunxi_hdmi_mode_set(mode, clk_div, clk_double);
sunxi_lcdc_mode_set(mode, &clk_div, &clk_double); sunxi_composer_enable();
sunxi_hdmi_mode_set(mode, clk_div, clk_double); sunxi_lcdc_enable();
sunxi_hdmi_enable();
setbits_le32(&de_be->reg_ctrl, SUNXI_DE_BE_REG_CTRL_LOAD_REGS); }
setbits_le32(&de_be->mode, SUNXI_DE_BE_MODE_START); break;
setbits_le32(&lcdc->ctrl, SUNXI_LCDC_CTRL_TCON_ENABLE); case sunxi_monitor_lcd:
/* TODO */
udelay(100); break;
case sunxi_monitor_vga:
setbits_le32(&hdmi->video_ctrl, SUNXI_HDMI_VIDEO_CTRL_ENABLE); break;
}
} }
static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor) static const char *sunxi_get_mon_desc(enum sunxi_monitor monitor)
@ -627,19 +654,30 @@ void *video_hw_init(void)
printf("Unknown monitor: '%s', falling back to '%s'\n", printf("Unknown monitor: '%s', falling back to '%s'\n",
mon, sunxi_get_mon_desc(sunxi_display.monitor)); mon, sunxi_get_mon_desc(sunxi_display.monitor));
/* Always call hdp_detect, as it also enables various clocks, etc. */ switch (sunxi_display.monitor) {
ret = sunxi_hdmi_hpd_detect(); case sunxi_monitor_none:
if (hpd && !ret) { return NULL;
case sunxi_monitor_dvi:
case sunxi_monitor_hdmi:
/* Always call hdp_detect, as it also enables clocks, etc. */
ret = sunxi_hdmi_hpd_detect();
if (ret) {
printf("HDMI connected: ");
if (edid && sunxi_hdmi_edid_get_mode(&edid_mode) == 0)
mode = &edid_mode;
break;
}
if (!hpd)
break; /* User has requested to ignore hpd */
sunxi_hdmi_shutdown(); sunxi_hdmi_shutdown();
return NULL; return NULL;
} case sunxi_monitor_lcd:
if (ret) printf("LCD not supported on this board\n");
printf("HDMI connected: "); return NULL;
case sunxi_monitor_vga:
/* Check edid if requested and we've a cable plugged in */ printf("VGA not supported on this board\n");
if (edid && ret) { return NULL;
if (sunxi_hdmi_edid_get_mode(&edid_mode) == 0)
mode = &edid_mode;
} }
if (mode->vmode != FB_VMODE_NONINTERLACED) { if (mode->vmode != FB_VMODE_NONINTERLACED) {