6c81b0044937a6c1fed98c1b3f38fcbfb8933251
[openwrt/openwrt.git] / target / linux / layerscape / patches-4.9 / 807-gpu-support-layerscape.patch
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
5
6 This is a integrated patch for layerscape dcu support.
7
8 Signed-off-by: Alison Wang <b18965@freescale.com>
9 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
10 ---
11 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 18 ++++++++++++++++--
12 1 file changed, 16 insertions(+), 2 deletions(-)
13
14 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
15 +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
16 @@ -225,7 +225,6 @@ static int fsl_dcu_drm_pm_suspend(struct
17 if (!fsl_dev)
18 return 0;
19
20 - disable_irq(fsl_dev->irq);
21 drm_kms_helper_poll_disable(fsl_dev->drm);
22
23 console_lock();
24 @@ -243,6 +242,8 @@ static int fsl_dcu_drm_pm_suspend(struct
25 return PTR_ERR(fsl_dev->state);
26 }
27
28 + disable_irq(fsl_dev->irq);
29 +
30 clk_disable_unprepare(fsl_dev->pix_clk);
31 clk_disable_unprepare(fsl_dev->clk);
32
33 @@ -263,6 +264,14 @@ static int fsl_dcu_drm_pm_resume(struct
34 return ret;
35 }
36
37 + ret = clk_prepare_enable(fsl_dev->pix_clk);
38 + if (ret < 0) {
39 + dev_err(dev, "failed to enable dcu pix clk\n");
40 + return ret;
41 + }
42 +
43 + enable_irq(fsl_dev->irq);
44 +
45 if (fsl_dev->tcon)
46 fsl_tcon_bypass_enable(fsl_dev->tcon);
47 fsl_dcu_drm_init_planes(fsl_dev->drm);
48 @@ -273,7 +282,6 @@ static int fsl_dcu_drm_pm_resume(struct
49 console_unlock();
50
51 drm_kms_helper_poll_enable(fsl_dev->drm);
52 - enable_irq(fsl_dev->irq);
53
54 return 0;
55 }
56 @@ -389,6 +397,12 @@ static int fsl_dcu_drm_probe(struct plat
57 goto disable_clk;
58 }
59
60 + ret = clk_prepare_enable(fsl_dev->pix_clk);
61 + if (ret < 0) {
62 + dev_err(dev, "failed to enable dcu pix clk\n");
63 + return ret;
64 + }
65 +
66 fsl_dev->tcon = fsl_tcon_init(dev);
67
68 drm = drm_dev_alloc(driver, dev);