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

drivers/amlogic/media/osd: fix potentially incorrect hw/pxp modes

Browse Source
This commit is contained in:
adamg
2019-02-22 11:08:02 +00:00
committed by Dongjin Kim
parent 4e30d1de2e
commit 2617009f5a
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/amlogic/media/osd/osd_fb.c
View File

@@ -4227,24 +4227,28 @@ static int osd_probe(struct platform_device *pdev)
}
#endif
/* get meson-fb resource from dt */
prop = of_get_property(pdev->dev.of_node, "scale_mode", NULL);
if (prop)
if (prop) {
prop_idx = of_read_ulong(prop, 1);
/* Todo: only osd0 */
osd_set_free_scale_mode_hw(DEV_OSD0, prop_idx);
/* Todo: only osd0 */
osd_set_free_scale_mode_hw(DEV_OSD0, prop_idx);
}
prop = of_get_property(pdev->dev.of_node, "4k2k_fb", NULL);
if (prop)
if (prop) {
prop_idx = of_read_ulong(prop, 1);
osd_set_4k2k_fb_mode_hw(prop_idx);
osd_set_4k2k_fb_mode_hw(prop_idx);
}
/* get default display mode from dt */
ret = of_property_read_string(pdev->dev.of_node,
"display_mode_default", &str);
ret = of_property_read_string(pdev->dev.of_node, "display_mode_default", &str);
prop = of_get_property(pdev->dev.of_node, "pxp_mode", NULL);
if (prop)
if (prop) {
prop_idx = of_read_ulong(prop, 1);
osd_set_pxp_mode(prop_idx);
osd_set_pxp_mode(prop_idx);
}
prop = of_get_property(pdev->dev.of_node, "ddr_urgent", NULL);
if (prop) {
@@ -4252,9 +4256,11 @@ static int osd_probe(struct platform_device *pdev)
osd_set_urgent(0, (prop_idx != 0) ? 1 : 0);
osd_set_urgent(1, (prop_idx != 0) ? 1 : 0);
}
prop = of_get_property(pdev->dev.of_node, "mem_alloc", NULL);
if (prop)
if (prop) {
b_alloc_mem = of_read_ulong(prop, 1);
}
vinfo = get_current_vinfo();
for (index = 0; index < osd_meson_dev.osd_count; index++) {