From 087d946bb9907dc20e0288ed6075c1804528375d Mon Sep 17 00:00:00 2001 From: Eunchul Kim Date: Sat, 22 Dec 2012 17:49:25 +0900 Subject: [PATCH] --- yaml --- r: 348423 b: refs/heads/master c: 5bbea0c41c677039203f445ad0529ab58751123e h: refs/heads/master i: 348421: da1b67e63e1b023293a013fcaa56a2c5fd9eb889 348419: 345cda853c270946c401d96dd27a5db426e0750e 348415: 2ea98c04aa9cacddb3f0d3f3feda9ae6df47e480 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8ce0312c3a0d..0b6d3fa34e4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f21877cb8b9e9f85a541af43b9ee66d9006bb69 +refs/heads/master: 5bbea0c41c677039203f445ad0529ab58751123e diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c index 3e5b4568d89c..410175a451cf 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_gsc.c @@ -1592,7 +1592,7 @@ static int gsc_ippdrv_start(struct device *dev, enum drm_exynos_ipp_cmd cmd) exynos_drm_ippnb_send_event(IPP_SET_WRITEBACK, (void *)&set_wb); /* src local path */ - cfg = readl(GSC_IN_CON); + cfg = gsc_read(GSC_IN_CON); cfg &= ~(GSC_IN_PATH_MASK | GSC_IN_LOCAL_SEL_MASK); cfg |= (GSC_IN_PATH_LOCAL | GSC_IN_LOCAL_FIMD_WB); gsc_write(cfg, GSC_IN_CON);