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 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)
  19         if (!fsl_dev)
  20                 return 0;
  21
  22 -       disable_irq(fsl_dev->irq);
  23         drm_kms_helper_poll_disable(fsl_dev->drm);
  24
  25         console_lock();
  26 @@ -243,6 +242,8 @@ static int fsl_dcu_drm_pm_suspend(struct device *dev)
  27                 return PTR_ERR(fsl_dev->state);
  28         }
  29
  30 +       disable_irq(fsl_dev->irq);
  31 +
  32         clk_disable_unprepare(fsl_dev->pix_clk);
  33         clk_disable_unprepare(fsl_dev->clk);
  34
  35 @@ -263,6 +264,14 @@ static int fsl_dcu_drm_pm_resume(struct device *dev)
  36                 return ret;
  37         }
  38
  39 +       ret = clk_prepare_enable(fsl_dev->pix_clk);
  40 +       if (ret < 0) {
  41 +               dev_err(dev, "failed to enable dcu pix clk\n");
  42 +               return ret;
  43 +       }
  44 +
  45 +       enable_irq(fsl_dev->irq);
  46 +
  47         if (fsl_dev->tcon)
  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)
  51         console_unlock();
  52
  53         drm_kms_helper_poll_enable(fsl_dev->drm);
  54 -       enable_irq(fsl_dev->irq);
  55
  56         return 0;
  57  }
  58 @@ -389,6 +397,12 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
  59                 goto disable_clk;
  60         }
  61
  62 +       ret = clk_prepare_enable(fsl_dev->pix_clk);
  63 +       if (ret < 0) {
  64 +               dev_err(dev, "failed to enable dcu pix clk\n");
  65 +               return ret;
  66 +       }
  67 +
  68         fsl_dev->tcon = fsl_tcon_init(dev);
  69
  70         drm = drm_dev_alloc(driver, dev);
  71 --
  72 2.14.1
  73