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

ODROID: Fix not working display on recovery without 1080p.

Browse Source 
Change-Id: I4ab12bf28fbe9e691eee28c5a4150df078d413a8
This commit is contained in:
Chris
2023-08-01 17:06:16 +09:00
parent 7d921aff2e
commit dfb81b4bb8
1 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/amlogic/media/osd/osd_hw.c
View File

@@ -488,23 +488,6 @@ static struct viu2_osd_reg_item viu2_osd_reg_table[VIU2_OSD_REG_NUM] = {
{VIU2_OSD1_DIMM_CTRL, 0x0, 0x7fffffff},
};
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
static bool recovery;
static int __init get_recovery_part(char *str)
{
if (str == NULL)
return -EINVAL;
if (!(strcmp(str, "recovery")))
recovery = 1;
else
recovery = 0;
return 0;
}
__setup("recovery_part=", get_recovery_part);
#endif
static int osd_setting_blending_scope(u32 index);
static int vpp_blend_setting_default(u32 index);
@@ -8750,15 +8733,15 @@ static int osd_setting_order(u32 output_index)
static void osd_setting_default_hwc(void)
{
u32 blend_hsize, blend_vsize;
u32 blend2_premult_en = 3, din_premult_en = 0;
u32 blend_din_en = 0x5;
u32 blend2_premult_en = 1, din_premult_en = 0;
u32 blend_din_en = 0x1;
/* blend_din0 input to blend0 */
u32 din0_byp_blend = 0;
u32 din0_byp_blend = 1;
/* blend1_dout to blend2 */
u32 din2_osd_sel = 0;
u32 din2_osd_sel = 1;
/* blend1_din3 input to blend1 */
u32 din3_osd_sel = 0;
u32 din_reoder_sel = 0x4441;
u32 din3_osd_sel = 1;
u32 din_reoder_sel = 0x1;
u32 postbld_src3_sel = 3, postbld_src4_sel = 0;
u32 postbld_osd1_premult = 0, postbld_osd2_premult = 0;
@@ -9734,10 +9717,7 @@ void osd_init_hw(u32 logo_loaded, u32 osd_probe,
#endif
osd_set_basic_urgent(true);
osd_set_two_ports(true);
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
if (recovery)
osd_setting_default_hwc();
#endif
osd_setting_default_hwc();
}
/* disable deband as default */
if (osd_hw.osd_meson_dev.has_deband)