1 From 4278a546526094dd57bfa3cf7ae2bf34092246db Mon Sep 17 00:00:00 2001
2 From: Yangbo Lu <yangbo.lu@nxp.com>
3 Date: Mon, 25 Sep 2017 12:10:01 +0800
4 Subject: [PATCH] gpu: support layerscape
6 This is a integrated patch for layerscape dcu support.
8 Signed-off-by: Alison Wang <b18965@freescale.com>
9 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
11 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 18 ++++++++++++++++--
12 1 file changed, 16 insertions(+), 2 deletions(-)
14 diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
15 index cc2fde2a..54f60ba1 100644
16 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
17 +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
18 @@ -225,7 +225,6 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
22 - disable_irq(fsl_dev->irq);
23 drm_kms_helper_poll_disable(fsl_dev->drm);
26 @@ -243,6 +242,8 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
27 return PTR_ERR(fsl_dev->state);
30 + disable_irq(fsl_dev->irq);
32 clk_disable_unprepare(fsl_dev->pix_clk);
33 clk_disable_unprepare(fsl_dev->clk);
35 @@ -263,6 +264,14 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
39 + ret = clk_prepare_enable(fsl_dev->pix_clk);
41 + dev_err(dev, "failed to enable dcu pix clk\n");
45 + enable_irq(fsl_dev->irq);
48 fsl_tcon_bypass_enable(fsl_dev->tcon);
49 fsl_dcu_drm_init_planes(fsl_dev->drm);
50 @@ -273,7 +282,6 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
53 drm_kms_helper_poll_enable(fsl_dev->drm);
54 - enable_irq(fsl_dev->irq);
58 @@ -389,6 +397,12 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
62 + ret = clk_prepare_enable(fsl_dev->pix_clk);
64 + dev_err(dev, "failed to enable dcu pix clk\n");
68 fsl_dev->tcon = fsl_tcon_init(dev);
70 drm = drm_dev_alloc(driver, dev);