From 568503e9523861f46b3f5ba0f0329121d590c4bc Mon Sep 17 00:00:00 2001 From: "hyesoo.yu" Date: Tue, 14 Nov 2017 19:00:55 +0900 Subject: [PATCH] Revert "[COMMON] g2d: disable sharabiltiy feature on g2d" This reverts commit 591b3c1c10af821c54eab5b72121e99ffa6c4772. Change-Id: I59dc83d3660c35b06b4221725cf223574534a66f Signed-off-by: hyesoo.yu --- drivers/gpu/exynos/g2d/g2d.h | 1 - drivers/gpu/exynos/g2d/g2d_drv.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/drivers/gpu/exynos/g2d/g2d.h b/drivers/gpu/exynos/g2d/g2d.h index 9c9275af51dc..afb69d2820ae 100644 --- a/drivers/gpu/exynos/g2d/g2d.h +++ b/drivers/gpu/exynos/g2d/g2d.h @@ -79,7 +79,6 @@ struct g2d_device { struct device *dev; struct clk *clock; void __iomem *reg; - void __iomem *sysreg; u64 fence_context; atomic_t fence_timeline; diff --git a/drivers/gpu/exynos/g2d/g2d_drv.c b/drivers/gpu/exynos/g2d/g2d_drv.c index fd5c7f8d0639..45afe0c19647 100644 --- a/drivers/gpu/exynos/g2d/g2d_drv.c +++ b/drivers/gpu/exynos/g2d/g2d_drv.c @@ -768,8 +768,6 @@ static int g2d_probe(struct platform_device *pdev) if (IS_ERR(g2d_dev->reg)) return PTR_ERR(g2d_dev->reg); - g2d_dev->sysreg = ioremap(0x17610000, SZ_4K); - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res) { dev_err(&pdev->dev, "Failed to get IRQ resource"); @@ -912,13 +910,8 @@ static int g2d_remove(struct platform_device *pdev) #ifdef CONFIG_PM static int g2d_runtime_resume(struct device *dev) { - struct g2d_device *g2d_dev = dev_get_drvdata(dev); - g2d_stamp_task(NULL, G2D_STAMP_STATE_RUNTIME_PM, 0); - /* clear [0:12] bit from SHARABILITY_CTRL */ - writel((readl(g2d_dev->sysreg + 0x408) & ~0x1FFF), g2d_dev->sysreg + 0x408); - return 0; } -- 2.20.1