summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Moń <desowin@gmail.com>2021-07-05 15:15:30 +0200
committerTomasz Moń <desowin@gmail.com>2021-07-05 15:19:52 +0200
commit2acf8db3e14e8c81f27cb0cea5b366678693c7b3 (patch)
tree95a60cd59f8debdfa7c5388a7ec4cdfbb4057176
parent89d3ca77b6ffd0ad499d91e8c66100f6d852e358 (diff)
downloadrockbox-2acf8db3e1.tar.gz
rockbox-2acf8db3e1.zip
Sansa Connect: Power off LCD to save power
Prevent startup screen flash by properly using AVR LCM functions. Power off LCD when not needed to improve battery runtime. Change-Id: I76e3c5c0208774f189fbc6f7d7b3c9e22c062285
-rw-r--r--bootloader/sansaconnect.c6
-rw-r--r--firmware/export/config/sansaconnect.h3
-rw-r--r--firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c5
-rw-r--r--firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c3
-rw-r--r--firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c117
5 files changed, 89 insertions, 45 deletions
diff --git a/bootloader/sansaconnect.c b/bootloader/sansaconnect.c
index a60fa71800..f154593818 100644
--- a/bootloader/sansaconnect.c
+++ b/bootloader/sansaconnect.c
@@ -239,9 +239,7 @@ void main(void)
font_init();
button_init();
-#ifdef HAVE_LCD_ENABLE
lcd_enable(true);
-#endif
lcd_setfont(FONT_SYSFIXED);
reset_screen();
show_logo();
@@ -288,10 +286,12 @@ void main(void)
if (ret > 0)
{
+ lcd_enable(false);
system_prepare_fw_start();
kernel_entry = (void*)0x01008000;
ret = kernel_entry();
+ lcd_enable(true);
printf("FAILED to boot OF");
}
}
@@ -309,10 +309,12 @@ void main(void)
}
else
{
+ lcd_enable(false);
system_prepare_fw_start();
kernel_entry = (void*) loadbuffer;
ret = kernel_entry();
+ lcd_enable(true);
printf("FAILED!");
}
diff --git a/firmware/export/config/sansaconnect.h b/firmware/export/config/sansaconnect.h
index 874b198316..5668d579fc 100644
--- a/firmware/export/config/sansaconnect.h
+++ b/firmware/export/config/sansaconnect.h
@@ -81,9 +81,8 @@
#define LCD_PIXELFORMAT RGB565 /* rgb565 */
#define HAVE_LCD_ENABLE
-#ifndef BOOTLOADER
#define HAVE_LCD_SLEEP
-#endif
+#define HAVE_LCD_SHUTDOWN
#define LCD_SLEEP_TIMEOUT (2*HZ)
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
index a8e0d5eb5e..8ebba3a8d5 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/avr-sansaconnect.c
@@ -857,8 +857,3 @@ bool button_hold(void)
{
return hold_switch;
}
-
-void lcd_enable(bool on)
-{
- (void)on;
-}
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c
index c65d806635..37cb672738 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/backlight-sansaconnect.c
@@ -52,13 +52,12 @@ static void _backlight_write_brightness(int brightness)
void backlight_hw_on(void)
{
-#ifdef HAVE_LCD_SLEEP
if (!lcd_active())
{
lcd_awake();
lcd_update();
}
-#endif
+
/* set GIO34 as PWM1 */
IO_GIO_FSEL3 = (IO_GIO_FSEL3 & 0xFFF3) | (1 << 2);
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c
index 07be11e849..9d58fccdb3 100644
--- a/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c
+++ b/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c
@@ -29,60 +29,109 @@
#include "lcd.h"
#include "lcd-target.h"
#include "avr-sansaconnect.h"
+#include "backlight-target.h"
-extern bool lcd_on; /* lcd-memframe.c */
+/* See lcd-memframe.c */
+extern void lcd_set_active(bool active);
+
+static bool lcd_powered;
-#if defined(HAVE_LCD_SLEEP)
void lcd_sleep(void)
{
- if (lcd_on)
+ if (lcd_powered)
{
- lcd_on = false;
+ lcd_set_active(false);
- avr_hid_lcm_sleep();
- sleep(HZ/20);
+ avr_hid_lcm_power_off();
+ mdelay(100);
+ /* Disable OSD window */
+ bitclr16(&IO_OSD_OSDWINMD0, 0x01);
/* disable video encoder */
- bitclr16(&IO_VID_ENC_VMOD, 0x01);
+ bitclr16(&IO_VID_ENC_VMOD, VENC_VMOD_VENC);
+ mdelay(66);
- sleep(HZ/20);
+ /* disable video encoder and OSD clocks */
+ bitclr16(&IO_CLK_MOD1, CLK_MOD1_VENC | CLK_MOD1_OSD);
- /* disable video encoder clock */
- bitclr16(&IO_CLK_MOD1, CLK_MOD1_VENC);
+ lcd_powered = false;
}
}
void lcd_awake(void)
{
- if (!lcd_on)
+ if (!lcd_powered)
{
- lcd_on = true;
+ /* Enable Video Encoder and OSD clocks */
+ bitset16(&IO_CLK_MOD1, CLK_MOD1_VENC | CLK_MOD1_OSD);
+ /* Enable OSD window */
+ bitset16(&IO_OSD_OSDWINMD0, 0x01);
+ /* Enable video encoder */
+ bitset16(&IO_VID_ENC_VMOD, VENC_VMOD_VENC);
+
+ avr_hid_lcm_power_on();
+ lcd_set_active(true);
+ avr_hid_lcm_wake();
- /* enable video encoder clock */
- bitset16(&IO_CLK_MOD1, CLK_MOD1_VENC);
+ lcd_powered = true;
+ send_event(LCD_EVENT_ACTIVATION, NULL);
+ }
+}
- /* enable video encoder */
- bitset16(&IO_VID_ENC_VMOD, 0x01);
+void lcd_shutdown(void)
+{
+ backlight_hw_off();
+ lcd_sleep();
+}
+
+void lcd_enable(bool enable)
+{
+ if (lcd_active() == enable)
+ return;
+
+ lcd_set_active(enable);
+
+ if (enable)
+ {
+ /* Enable Video Encoder and OSD clocks */
+ bitset16(&IO_CLK_MOD1, CLK_MOD1_VENC | CLK_MOD1_OSD);
+ /* Enable OSD window */
+ bitset16(&IO_OSD_OSDWINMD0, 0x01);
+ /* Enable video encoder */
+ bitset16(&IO_VID_ENC_VMOD, VENC_VMOD_VENC);
avr_hid_lcm_wake();
+ mdelay(30);
send_event(LCD_EVENT_ACTIVATION, NULL);
+ }
+ else
+ {
+ mdelay(30);
+ avr_hid_lcm_sleep();
+ mdelay(10);
- lcd_update();
+ /* Disable OSD window */
+ bitclr16(&IO_OSD_OSDWINMD0, 0x01);
+ /* disable video encoder */
+ bitclr16(&IO_VID_ENC_VMOD, VENC_VMOD_VENC);
+ mdelay(66);
+
+ /* disable video encoder and OSD clocks */
+ bitclr16(&IO_CLK_MOD1, CLK_MOD1_VENC | CLK_MOD1_OSD);
}
}
-#endif
void lcd_init_device(void)
{
unsigned int addr;
-
+
/* Disable Video Encoder clock */
bitclr16(&IO_CLK_MOD1, CLK_MOD1_VENC);
/* configure GIO39, GIO34 as outputs */
IO_GIO_DIR2 &= ~((1 << 7) /* GIO39 */ | (1 << 2) /* GIO34 */);
-
+
IO_GIO_FSEL3 = (IO_GIO_FSEL3 & ~(0x300F)) |
(0x1000) /* GIO39 - FIELD_VENC */ |
(0x4); /* GIO34 - PWM1 (brightness control) */
@@ -121,10 +170,9 @@ void lcd_init_device(void)
IO_VID_ENC_VMOD = 0x2015; /* OF sets 0x2011 */
/* Copy Rockbox frame buffer to the second framebuffer */
+ lcd_set_active(true);
lcd_update();
- avr_hid_lcm_power_on();
-
/* set framebuffer address - OF sets RAM start address to 0x1000000 */
addr = ((int)FRAME-CONFIG_SDRAM_START)/32;
@@ -149,8 +197,9 @@ void lcd_init_device(void)
/* Enable Video Encoder - RGB666, custom timing */
IO_VID_ENC_VMOD = 0x2015;
+
+ lcd_powered = true;
avr_hid_lcm_wake();
- lcd_on = true;
}
#ifdef LCD_USE_DMA
@@ -167,14 +216,14 @@ static void dma_lcd_copy_buffer_rect(int x, int y, int width, int height)
/* Set source and destination addresses */
dst = (char*)(FRAME + LCD_WIDTH*y + x);
src = (char*)(FBADDR(x,y));
-
+
/* Flush cache to memory */
commit_dcache();
/* Addresses are relative to start of SDRAM */
src -= CONFIG_SDRAM_START;
dst -= CONFIG_SDRAM_START;
-
+
/* Enable Image Buffer clock */
bitset16(&IO_CLK_MOD1, CLK_MOD1_IMGBUF);
@@ -191,7 +240,7 @@ static void dma_lcd_copy_buffer_rect(int x, int y, int width, int height)
/* Set the start address of buffer */
COP_BUF_ADDR = 0x0000;
-
+
/* Setup SDRAM stride */
COP_SDEM_LOFST = LCD_WIDTH;
@@ -200,28 +249,28 @@ static void dma_lcd_copy_buffer_rect(int x, int y, int width, int height)
addr = (int)src;
addr >>= 1; /* Addresses are in 16-bit words */
-
+
/* Setup the registers to initiate the read from SDRAM */
COP_SDEM_ADDRH = addr >> 16;
COP_SDEM_ADDRL = addr & 0xFFFF;
-
+
/* Set direction and start */
COP_DMA_CTRL = 0x0001;
COP_DMA_CTRL |= 0x0002;
/* Wait for read to finish */
while (COP_DMA_CTRL & 0x02) {};
-
+
addr = (int)dst;
addr >>= 1;
-
+
COP_SDEM_ADDRH = addr >> 16;
COP_SDEM_ADDRL = addr & 0xFFFF;
-
+
/* Set direction and start transfer */
COP_DMA_CTRL = 0x0000;
COP_DMA_CTRL |= 0x0002;
-
+
/* Wait for the transfer to complete */
while (COP_DMA_CTRL & 0x02) {};
@@ -246,7 +295,7 @@ void lcd_update_rect(int x, int y, int width, int height)
__attribute__ ((section(".icode")));
void lcd_update_rect(int x, int y, int width, int height)
{
- if (!lcd_on)
+ if (!lcd_active())
return;
if ((width | height) < 0)
@@ -270,7 +319,7 @@ void lcd_update_rect(int x, int y, int width, int height)
void lcd_update(void) __attribute__ ((section(".icode")));
void lcd_update(void)
{
- if (!lcd_on)
+ if (!lcd_active())
return;
lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT);