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

lcd: clear mute after driver reset

Browse Source 
PD#172121: lcd: clear mute after driver reset
also update CONFIG AML_VOUT_FRAMERATE_AUTOMATION to AMLOGIC_VOUT_SERVE

Change-Id: I65309c6c3b43fabc4e95269114ad22d18d360a41
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
This commit is contained in:
Evoke Zhang
2018-08-21 13:12:33 +08:00
committed by Jianxin Pan
parent 00d2788e18
commit deec7933e9
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/amlogic/media/vout/lcd/lcd_tablet/lcd_tablet.c
View File

@@ -133,7 +133,7 @@ static int lcd_vout_get_state(void)
return lcd_vout_state;
}
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct lcd_vframe_match_s {
int fps;
int frame_rate; /* *100 */
@@ -207,7 +207,7 @@ static int lcd_framerate_automation_set_mode(void)
static int lcd_set_vframe_rate_hint(int duration)
{
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct aml_lcd_drv_s *lcd_drv = aml_lcd_get_driver();
struct vinfo_s *info;
int fr_policy;
@@ -238,7 +238,7 @@ static int lcd_set_vframe_rate_hint(int duration)
__func__, fr_policy);
return 0;
}
fps = get_vsource_fps(duration);
fps = vout_get_vsource_fps(duration);
for (i = 0; i < n; i++) {
if (fps == vtable[i].fps) {
frame_rate = vtable[i].frame_rate;
@@ -267,7 +267,7 @@ static int lcd_set_vframe_rate_hint(int duration)
static int lcd_set_vframe_rate_end_hint(void)
{
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct aml_lcd_drv_s *lcd_drv = aml_lcd_get_driver();
struct vinfo_s *info;
@@ -295,7 +295,7 @@ static int lcd_set_vframe_rate_end_hint(void)
static int lcd_set_vframe_rate_policy(int policy)
{
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct aml_lcd_drv_s *lcd_drv = aml_lcd_get_driver();
lcd_drv->fr_auto_policy = policy;
@@ -306,7 +306,7 @@ static int lcd_set_vframe_rate_policy(int policy)
static int lcd_get_vframe_rate_policy(void)
{
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct aml_lcd_drv_s *lcd_drv = aml_lcd_get_driver();
return lcd_drv->fr_auto_policy;

12
drivers/amlogic/media/vout/lcd/lcd_tv/lcd_tv.c
View File

@@ -391,7 +391,7 @@ static int lcd_vout_get_state(void)
return lcd_vout_state;
}
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct lcd_vframe_match_s {
int fps;
int frame_rate; /* *100 */
@@ -461,7 +461,7 @@ static int lcd_framerate_automation_set_mode(void)
static int lcd_set_vframe_rate_hint(int duration)
{
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct aml_lcd_drv_s *lcd_drv = aml_lcd_get_driver();
struct vinfo_s *info;
int fr_policy;
@@ -500,7 +500,7 @@ static int lcd_set_vframe_rate_hint(int duration)
__func__, fr_policy);
return 0;
}
fps = get_vsource_fps(duration);
fps = vout_get_vsource_fps(duration);
for (i = 0; i < n; i++) {
if (fps == vtable[i].fps) {
frame_rate = vtable[i].frame_rate;
@@ -529,7 +529,7 @@ static int lcd_set_vframe_rate_hint(int duration)
static int lcd_set_vframe_rate_end_hint(void)
{
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct aml_lcd_drv_s *lcd_drv = aml_lcd_get_driver();
struct vinfo_s *info;
@@ -565,7 +565,7 @@ static int lcd_set_vframe_rate_end_hint(void)
static int lcd_set_vframe_rate_policy(int policy)
{
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct aml_lcd_drv_s *lcd_drv = aml_lcd_get_driver();
if (lcd_vout_serve_bypass) {
@@ -580,7 +580,7 @@ static int lcd_set_vframe_rate_policy(int policy)
static int lcd_get_vframe_rate_policy(void)
{
#ifdef CONFIG_AML_VOUT_FRAMERATE_AUTOMATION
#ifdef CONFIG_AMLOGIC_VOUT_SERVE
struct aml_lcd_drv_s *lcd_drv = aml_lcd_get_driver();
return lcd_drv->fr_auto_policy;

2
drivers/amlogic/media/vout/lcd/lcd_vout.c
View File

@@ -361,6 +361,8 @@ static void lcd_module_reset(void)
lcd_driver->lcd_status |= LCD_STATUS_ON;
lcd_driver->lcd_config->change_flag = 0;
lcd_driver->lcd_mute_flag = (unsigned char)(0 | LCD_MUTE_UPDATE);
mutex_unlock(&lcd_vout_mutex);
}