system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-26 21:29:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/exynos/fimc: simplify irq masking function

Browse source 
The name fimc_handle_irq suggests it is irq handler, but the function
is for irq mask configuration. The patch renames the function to
fimc_mask_irq and removes unused arguments.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Andrzej Hajda 2014-05-19 12:54:07 +02:00 committed by Inki Dae
parent be6cdfd17c
commit 8b4609cd80
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/gpu/drm/exynos/exynos_drm_fimc.c
View file

@ -290,25 +290,18 @@ static void fimc_handle_jpeg(struct fimc_context *ctx, bool enable)
fimc_write(cfg, EXYNOS_CIGCTRL); fimc_write(cfg, EXYNOS_CIGCTRL);
} }
static void fimc_handle_irq(struct fimc_context *ctx, bool enable, static void fimc_mask_irq(struct fimc_context *ctx, bool enable)
bool overflow, bool level)
{ {
u32 cfg; u32 cfg;
DRM_DEBUG_KMS("enable[%d]overflow[%d]level[%d]\n", DRM_DEBUG_KMS("enable[%d]\n", enable);
enable, overflow, level);
cfg = fimc_read(EXYNOS_CIGCTRL); cfg = fimc_read(EXYNOS_CIGCTRL);
if (enable) { if (enable) {
cfg &= ~(EXYNOS_CIGCTRL_IRQ_OVFEN | EXYNOS_CIGCTRL_IRQ_LEVEL); cfg &= ~EXYNOS_CIGCTRL_IRQ_OVFEN;
cfg |= EXYNOS_CIGCTRL_IRQ_ENABLE; cfg |= EXYNOS_CIGCTRL_IRQ_ENABLE | EXYNOS_CIGCTRL_IRQ_LEVEL;
if (overflow)
cfg |= EXYNOS_CIGCTRL_IRQ_OVFEN;
if (level)
cfg |= EXYNOS_CIGCTRL_IRQ_LEVEL;
} else } else
cfg &= ~(EXYNOS_CIGCTRL_IRQ_OVFEN | EXYNOS_CIGCTRL_IRQ_ENABLE); cfg &= ~EXYNOS_CIGCTRL_IRQ_ENABLE;
fimc_write(cfg, EXYNOS_CIGCTRL); fimc_write(cfg, EXYNOS_CIGCTRL);
} }
@ -1180,12 +1173,12 @@ static int fimc_dst_set_buf_seq(struct fimc_context *ctx, u32 buf_id,
/* interrupt enable */ /* interrupt enable */
if (buf_type == IPP_BUF_ENQUEUE && if (buf_type == IPP_BUF_ENQUEUE &&
fimc_dst_get_buf_seq(ctx) >= FIMC_BUF_START) fimc_dst_get_buf_seq(ctx) >= FIMC_BUF_START)
fimc_handle_irq(ctx, true, false, true); fimc_mask_irq(ctx, true);
/* interrupt disable */ /* interrupt disable */
if (buf_type == IPP_BUF_DEQUEUE && if (buf_type == IPP_BUF_DEQUEUE &&
fimc_dst_get_buf_seq(ctx) <= FIMC_BUF_STOP) fimc_dst_get_buf_seq(ctx) <= FIMC_BUF_STOP)
fimc_handle_irq(ctx, false, false, true); fimc_mask_irq(ctx, false);
err_unlock: err_unlock:
mutex_unlock(&ctx->lock); mutex_unlock(&ctx->lock);
@ -1520,7 +1513,7 @@ static int fimc_ippdrv_start(struct device *dev, enum drm_exynos_ipp_cmd cmd)
property = &c_node->property; property = &c_node->property;
fimc_handle_irq(ctx, true, false, true); fimc_mask_irq(ctx, true);
for_each_ipp_ops(i) { for_each_ipp_ops(i) {
config = &property->config[i]; config = &property->config[i];
@ -1639,7 +1632,7 @@ static void fimc_ippdrv_stop(struct device *dev, enum drm_exynos_ipp_cmd cmd)
break; break;
} }
fimc_handle_irq(ctx, false, false, true); fimc_mask_irq(ctx, false);
/* reset sequence */ /* reset sequence */
fimc_write(0x0, EXYNOS_CIFCNTSEQ); fimc_write(0x0, EXYNOS_CIFCNTSEQ);