From adc4fb5bc54957fb2422878b79dcaf93b782e2c5 Mon Sep 17 00:00:00 2001 From: Chris KIM Date: Thu, 21 Feb 2019 14:55:10 +0900 Subject: [PATCH] Revert "ODROID-N2: osd: support flexible fb size with free scale option" This reverts commit e34d6ee04098766d9b2e40e250f803ccd870bed3. Change-Id: Icf9a0069fd26103fbb6185163dfbc9ea5ea78e96 --- drivers/amlogic/media/osd/osd_fb.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/amlogic/media/osd/osd_fb.c b/drivers/amlogic/media/osd/osd_fb.c index 142f15e96519..965de8e10b28 100644 --- a/drivers/amlogic/media/osd/osd_fb.c +++ b/drivers/amlogic/media/osd/osd_fb.c @@ -396,15 +396,6 @@ static int osd_set_fb_var(int index, const struct vinfo_s *vinfo) return 0; } - -static void osd_set_fb_parameters(int index, const struct vinfo_s *vinfo) -{ - osd_set_free_scale_enable_hw(index, 0); - osd_set_free_scale_mode_hw(index, 1); - osd_set_free_scale_axis_hw(index, 0, 0, vinfo->width, vinfo->height); - osd_set_window_axis_hw(index, 0, 0, vinfo->width, vinfo->height); - osd_enable_hw(index, 1); -} #endif /* CONFIG_ARCH_MESON64_ODROID_COMMON */ phys_addr_t get_fb_rmem_paddr(int index) @@ -3951,11 +3942,6 @@ static int osd_probe(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(osd_attrs_viu2); i++) ret = device_create_file(fbi->dev, &osd_attrs_viu2[i]); } - -#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) - if (index == DEV_OSD0) - osd_set_fb_parameters(DEV_OSD0, vinfo); -#endif } #ifdef CONFIG_AMLOGIC_LEGACY_EARLY_SUSPEND early_suspend.level = EARLY_SUSPEND_LEVEL_STOP_DRAWING;