From 14f570595b5b9c8f2b371b7b400aa3d9f9b8f6d6 Mon Sep 17 00:00:00 2001 From: Sunmi Lee Date: Sun, 17 Jun 2018 16:43:55 +0900 Subject: [PATCH] [COMMON] fimc-is2: Removed unused code - HACK from previous hardware Change-Id: I514f36739fcc730d3c93108b726bc9724c62abb4 Signed-off-by: Sunmi Lee --- .../fimc-is2/hardware/fimc-is-hw-control.c | 4 --- .../fimc-is2/hardware/fimc-is-hw-control.h | 3 --- .../hardware/fimc-is-hw-mcscaler-v2.c | 27 ------------------- 3 files changed, 34 deletions(-) diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c index b994ea0fde79..95fec55678ba 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c @@ -685,10 +685,6 @@ int fimc_is_hardware_probe(struct fimc_is_hardware *hardware, } -#ifdef HW_BUG_WA_NO_CONTOLL_PER_FRAME - sema_init(&hardware->smp_mcsc_hw_bug, 1); -#endif - #if defined(SOC_PAF0) hw_id = DEV_HW_PAF0; hw_slot = fimc_is_hw_slot_id(hw_id); diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.h b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.h index d26ad62c7453..10debc9187e6 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.h +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.h @@ -360,9 +360,6 @@ struct fimc_is_hardware { atomic_t bug_count; atomic_t log_count; -#ifdef HW_BUG_WA_NO_CONTOLL_PER_FRAME - struct semaphore smp_mcsc_hw_bug; -#endif bool video_mode; /* fast read out in hardware */ bool hw_fro_en; diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c index 4821f52103b6..f8cc7c596f3e 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c @@ -18,9 +18,6 @@ spinlock_t shared_output_slock; static ulong hw_mcsc_out_configured = 0xFFFF; #define HW_MCSC_OUT_CLEARED_ALL (MCSC_OUTPUT_MAX) -#ifdef HW_BUG_WA_NO_CONTOLL_PER_FRAME -static bool flag_mcsc_hw_bug_lock; -#endif static int fimc_is_hw_mcsc_rdma_cfg(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame *frame); static void fimc_is_hw_mcsc_wdma_cfg(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame *frame); @@ -794,15 +791,6 @@ static int fimc_is_hw_mcsc_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_fram lindex = frame->shot->ctl.vendor_entry.lowIndexParam; hindex = frame->shot->ctl.vendor_entry.highIndexParam; -#ifdef HW_BUG_WA_NO_CONTOLL_PER_FRAME - /* S/W WA for Lhotse MCSC EVT0 HW BUG*/ - ret = down_interruptible(&hardware->smp_mcsc_hw_bug); - if (ret) - mserr_hw("smp_mcsc_hw_bug fail", instance, hw_ip); - else - flag_mcsc_hw_bug_lock = true; -#endif - if (hardware->video_mode) hw_mcsc->djag_input_source = DEV_HW_MCSC0; else @@ -1275,9 +1263,6 @@ void fimc_is_hw_mcsc_frame_done(struct fimc_is_hw_ip *hw_ip, struct fimc_is_fram u32 index; int instance = atomic_read(&hw_ip->instance); bool flag_get_meta = true; -#ifdef HW_BUG_WA_NO_CONTOLL_PER_FRAME - struct fimc_is_hardware *hardware; -#endif ulong flags = 0; FIMC_BUG_VOID(!hw_ip->priv_info); @@ -1292,18 +1277,6 @@ void fimc_is_hw_mcsc_frame_done(struct fimc_is_hw_ip *hw_ip, struct fimc_is_fram fimc_is_scaler_set_ysum_enable(hw_ip->regs, false); } -#ifdef HW_BUG_WA_NO_CONTOLL_PER_FRAME - hardware = hw_ip->hardware; - - if (flag_mcsc_hw_bug_lock) { - flag_mcsc_hw_bug_lock = false; - msdbg_hw(2, "mcsc_status = %x, %x\n", instance, hw_ip, - fimc_is_scaler_get_idle_status(hw_ip->regs, DEV_HW_MCSC0), - fimc_is_scaler_get_idle_status(hw_ip->regs, DEV_HW_MCSC1)); - up(&hardware->smp_mcsc_hw_bug); - } -#endif - switch (done_type) { case IS_SHOT_SUCCESS: framemgr = hw_ip->framemgr; -- 2.20.1