p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/exynos/decon5433: use readl_poll_timeout helpers 

Linux core provide helpers for polling with timeout, lets use them.

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 2017-08-24 15:33:50 +02:00 committed by Inki Dae
parent 7c0059dd83
commit 30b8913fd3
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/exynos/exynos5433_drm_decon.c
View File

@ -13,6 +13,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/component.h> #include <linux/component.h>
#include <linux/iopoll.h>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
@ -407,24 +408,19 @@ static void decon_atomic_flush(struct exynos_drm_crtc *crtc)
static void decon_swreset(struct decon_context *ctx) static void decon_swreset(struct decon_context *ctx)
{ {
unsigned int tries;
unsigned long flags; unsigned long flags;
u32 val;
int ret;
writel(0, ctx->addr + DECON_VIDCON0); writel(0, ctx->addr + DECON_VIDCON0);
for (tries = 2000; tries; --tries) { readl_poll_timeout(ctx->addr + DECON_VIDCON0, val,
if (~readl(ctx->addr + DECON_VIDCON0) & VIDCON0_STOP_STATUS) ~val & VIDCON0_STOP_STATUS, 12, 20000);
break;
udelay(10);
}
writel(VIDCON0_SWRESET, ctx->addr + DECON_VIDCON0); writel(VIDCON0_SWRESET, ctx->addr + DECON_VIDCON0);
for (tries = 2000; tries; --tries) { ret = readl_poll_timeout(ctx->addr + DECON_VIDCON0, val,
if (~readl(ctx->addr + DECON_VIDCON0) & VIDCON0_SWRESET) ~val & VIDCON0_SWRESET, 12, 20000);
break;
udelay(10);
}
WARN(tries == 0, "failed to software reset DECON\n"); WARN(ret < 0, "failed to software reset DECON\n");
spin_lock_irqsave(&ctx->vblank_lock, flags); spin_lock_irqsave(&ctx->vblank_lock, flags);
ctx->frame_id = 0; ctx->frame_id = 0;