iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/exynos/fimc: replace mutex by spinlock

Browse Source 
Function fimc_dst_set_buf_seq is called by irq handler
so it should not use mutexes. This patch fixes it.

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:09 +02:00 committed by Inki Dae
parent acd8afa824
commit 72d465aabc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/exynos/exynos_drm_fimc.c
View File

@ -18,6 +18,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/spinlock.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/exynos_drm.h> #include <drm/exynos_drm.h>
@ -158,7 +159,7 @@ struct fimc_context {
struct exynos_drm_ippdrv ippdrv; struct exynos_drm_ippdrv ippdrv;
struct resource *regs_res; struct resource *regs_res;
void __iomem *regs; void __iomem *regs;
struct mutex lock; spinlock_t lock;
struct clk *clocks[FIMC_CLKS_MAX]; struct clk *clocks[FIMC_CLKS_MAX];
u32 clk_frequency; u32 clk_frequency;
struct regmap *sysreg; struct regmap *sysreg;
@ -1146,10 +1147,11 @@ static int fimc_dst_set_buf_seq(struct fimc_context *ctx, u32 buf_id,
u32 cfg; u32 cfg;
u32 mask = 0x00000001 << buf_id; u32 mask = 0x00000001 << buf_id;
int ret = 0; int ret = 0;
unsigned long flags;
DRM_DEBUG_KMS("buf_id[%d]buf_type[%d]\n", buf_id, buf_type); DRM_DEBUG_KMS("buf_id[%d]buf_type[%d]\n", buf_id, buf_type);
mutex_lock(&ctx->lock); spin_lock_irqsave(&ctx->lock, flags);
/* mask register set */ /* mask register set */
cfg = fimc_read(ctx, EXYNOS_CIFCNTSEQ); cfg = fimc_read(ctx, EXYNOS_CIFCNTSEQ);
@ -1183,7 +1185,7 @@ static int fimc_dst_set_buf_seq(struct fimc_context *ctx, u32 buf_id,
fimc_mask_irq(ctx, false); fimc_mask_irq(ctx, false);
err_unlock: err_unlock:
mutex_unlock(&ctx->lock); spin_unlock_irqrestore(&ctx->lock, flags);
return ret; return ret;
} }
@ -1794,7 +1796,7 @@ static int fimc_probe(struct platform_device *pdev)
DRM_DEBUG_KMS("id[%d]ippdrv[0x%x]\n", ctx->id, (int)ippdrv); DRM_DEBUG_KMS("id[%d]ippdrv[0x%x]\n", ctx->id, (int)ippdrv);
mutex_init(&ctx->lock); spin_lock_init(&ctx->lock);
platform_set_drvdata(pdev, ctx); platform_set_drvdata(pdev, ctx);
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
@ -1825,7 +1827,6 @@ static int fimc_remove(struct platform_device *pdev)
struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv; struct exynos_drm_ippdrv *ippdrv = &ctx->ippdrv;
exynos_drm_ippdrv_unregister(ippdrv); exynos_drm_ippdrv_unregister(ippdrv);
mutex_destroy(&ctx->lock);
fimc_put_clocks(ctx); fimc_put_clocks(ctx);
pm_runtime_set_suspended(dev); pm_runtime_set_suspended(dev);