kernel: bump 4.9 to 4.9.87

[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-4.9 / 807-gpu-support-layerscape.patch

diff --git a/target/linux/layerscape/patches-4.9/807-gpu-support-layerscape.patch b/target/linux/layerscape/patches-4.9/807-gpu-support-layerscape.patch
index 6c81b0044937a6c1fed98c1b3f38fcbfb8933251..5aea9ea738d9ec85d204652e9adbc96e38109a71 100644 (file)
--- a/target/linux/layerscape/patches-4.9/807-gpu-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.9/807-gpu-support-layerscape.patch
@@ -1,15 +1,15 @@
-From 4278a546526094dd57bfa3cf7ae2bf34092246db Mon Sep 17 00:00:00 2001
+From 177f92a14d8177124f37db0fafc11182e2dcdd62 Mon Sep 17 00:00:00 2001
 From: Yangbo Lu <yangbo.lu@nxp.com>
-Date: Mon, 25 Sep 2017 12:10:01 +0800
-Subject: [PATCH] gpu: support layerscape
+Date: Wed, 17 Jan 2018 15:33:05 +0800
+Subject: [PATCH 19/30] gpu: support layerscape
 
-This is a integrated patch for layerscape dcu support.
+This is an integrated patch for layerscape dcu support.
 
 Signed-off-by: Alison Wang <b18965@freescale.com>
 Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 ---
- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
 
 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
 +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -27,10 +27,10 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  
 +      disable_irq(fsl_dev->irq);
 +
-       clk_disable_unprepare(fsl_dev->pix_clk);
        clk_disable_unprepare(fsl_dev->clk);
  
-@@ -263,6 +264,14 @@ static int fsl_dcu_drm_pm_resume(struct
+       return 0;
+@@ -262,6 +263,12 @@ static int fsl_dcu_drm_pm_resume(struct
                return ret;
        }
  
@@ -39,21 +39,11 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 +              dev_err(dev, "failed to enable dcu pix clk\n");
 +              return ret;
 +      }
-+
-+      enable_irq(fsl_dev->irq);
 +
        if (fsl_dev->tcon)
                fsl_tcon_bypass_enable(fsl_dev->tcon);
        fsl_dcu_drm_init_planes(fsl_dev->drm);
-@@ -273,7 +282,6 @@ static int fsl_dcu_drm_pm_resume(struct
-       console_unlock();
- 
-       drm_kms_helper_poll_enable(fsl_dev->drm);
--      enable_irq(fsl_dev->irq);
- 
-       return 0;
- }
-@@ -389,6 +397,12 @@ static int fsl_dcu_drm_probe(struct plat
+@@ -388,6 +395,12 @@ static int fsl_dcu_drm_probe(struct plat
                goto disable_clk;
        }