du_cmm: Release for Yocto v3.9.0

This patch made the following correspondence. - Corresponds to kernel v4.14.35 Signed-off-by: Koji Matsuoka <[email protected]>
renesas-rcar · Jun 13, 2018 · d91ce9d · d91ce9d
1 parent 53973b8
commit d91ce9d
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 43 deletions.
diff --git a/...3/recipes-kernel/linux/linux-renesas/salvator-x/0001-drm-rcar-du-Add-DU-CMM-support.patch b/...3/recipes-kernel/linux/linux-renesas/salvator-x/0001-drm-rcar-du-Add-DU-CMM-support.patch
@@ -1,9 +1,9 @@
-From c4168bdb2c59dc6489d60fbd7648bc034fd10573 Mon Sep 17 00:00:00 2001
-From: Tsutomu Muroya <[email protected]>
-Date: Thu, 22 Mar 2018 18:04:14 +0900
-Subject: [PATCH] drm: rcar-du: Fix a problem when accessing when CMM startup
+From b40cf655f1d6b420bcdd53b6a1276acf21ef0737 Mon Sep 17 00:00:00 2001
+From: Sojiro Kusunoki <[email protected]>
+Date: Mon, 11 Jun 2018 16:18:50 +0900
+Subject: [PATCH] drm: rcar-du: Add DU CMM support
 
-Signed-off-by: Tsutomu Muroya <[email protected]>
+Signed-off-by: Sojiro Kusunoki <[email protected]>
 ---
  .../boot/dts/renesas/r8a7795-es1-salvator-x.dts    |    5 +
  arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |    5 +
@@ -15,6 +15,7 @@ Signed-off-by: Tsutomu Muroya <[email protected]>
  .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts |    4 +
  .../boot/dts/renesas/r8a77965-salvator-xs.dts      |    4 +
  arch/arm64/boot/dts/renesas/r8a77965.dtsi          |   24 +-
+ arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts     |    6 +-
  arch/arm64/boot/dts/renesas/r8a77990.dtsi          |   21 +-
  drivers/clk/renesas/r8a7795-cpg-mssr.c             |    4 +
  drivers/clk/renesas/r8a7796-cpg-mssr.c             |    3 +
@@ -24,16 +25,16 @@ Signed-off-by: Tsutomu Muroya <[email protected]>
  drivers/gpu/drm/rcar-du/rcar_du_cmm.c              | 1770 ++++++++++++++++++++
  drivers/gpu/drm/rcar-du/rcar_du_crtc.c             |   24 +
  drivers/gpu/drm/rcar-du/rcar_du_crtc.h             |   32 +
- drivers/gpu/drm/rcar-du/rcar_du_drv.c              |   52 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c              |   53 +-
  drivers/gpu/drm/rcar-du/rcar_du_drv.h              |   12 +-
  drivers/gpu/drm/rcar-du/rcar_du_group.c            |    5 +
  drivers/gpu/drm/rcar-du/rcar_du_regs.h             |   92 +
  include/uapi/drm/rcar_du_drm.h                     |  131 +-
- 24 files changed, 2227 insertions(+), 33 deletions(-)
+ 25 files changed, 2232 insertions(+), 35 deletions(-)
  create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_cmm.c
 
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
-index ca1c567..ab6d3ba 100644
+index 39436cc..6e13a5e 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
 @@ -96,11 +96,16 @@
@@ -96,10 +97,10 @@ index 84d946c..02923f1 100644
 
  	ports {
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index 37418e3..1427450 100644
+index 5bfb001..eb8b1ff 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-@@ -3297,8 +3297,13 @@
+@@ -3457,8 +3457,13 @@
  		du: display@feb00000 {
  			compatible = "renesas,du-r8a7795";
  			reg = <0 0xfeb00000 0 0x80000>,
@@ -115,7 +116,7 @@ index 37418e3..1427450 100644
  			interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>,
  				     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
  				     <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>,
-@@ -3307,14 +3312,24 @@
+@@ -3467,14 +3472,24 @@
  				 <&cpg CPG_MOD 723>,
  				 <&cpg CPG_MOD 722>,
  				 <&cpg CPG_MOD 721>,
@@ -145,7 +146,7 @@ index 37418e3..1427450 100644
  			status = "disabled";
 
 diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
-index 09c7228..ed4d08b 100644
+index a2ce432..76f4807 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 @@ -85,12 +85,15 @@
@@ -185,10 +186,10 @@ index 38d0161..1bf2628 100644
 
  	ports {
 diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index abda97cd..0561947 100644
+index 4797a63..145bbe5 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-@@ -3081,21 +3081,33 @@
+@@ -3231,21 +3231,33 @@
  		du: display@feb00000 {
  			compatible = "renesas,du-r8a7796";
  			reg = <0 0xfeb00000 0 0x70000>,
@@ -267,10 +268,10 @@ index 41f6b05..f47ee2f 100644
 
  	ports {
 diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
-index 41b25c8..0892fc8 100644
+index b3890cf..b12ff04 100644
 --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
-@@ -2491,21 +2491,33 @@
+@@ -2492,21 +2492,33 @@
  		du: display@feb00000 {
  			compatible = "renesas,du-r8a77965";
  			reg = <0 0xfeb00000 0 0x80000>,
@@ -310,11 +311,29 @@ index 41b25c8..0892fc8 100644
  			status = "disabled";
 
  			vsps = <&vspd0 0 &vspd1 0 &vspd0 1>;
+diff --git a/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts b/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
+index c17f350..1410680 100644
+--- a/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
++++ b/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
+@@ -370,9 +370,11 @@
+ 		 <&cpg CPG_MOD 727>,
+ 		 <&cpg CPG_MOD 727>,
+ 		 <&x13_clk>,
+-		 <&extal_clk>;
++		 <&extal_clk>,
++		 <&cpg CPG_MOD 711>,
++		 <&cpg CPG_MOD 710>;
+ 	clock-names = "du.0", "du.1", "lvds.0", "lvds.1",
+-		      "dclkin.0", "extal";
++		      "dclkin.0", "extal", "cmm.0", "cmm.1";
+
+ 	ports {
+ 		port@0 {
 diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
-index a4485d4..05ad0be 100644
+index 7c7ae9a..861570b 100644
 --- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
-@@ -1929,20 +1929,29 @@
+@@ -1933,20 +1933,29 @@
  			compatible = "renesas,du-r8a77990";
  			reg = <0 0xfeb00000 0 0x40000>,
  			      <0 0xfeb90000 0 0x100>,
@@ -351,7 +370,7 @@ index a4485d4..05ad0be 100644
 
  			vsps = <&vspd0 &vspd1>;
 diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-index bc5eeb6..754d5b0 100644
+index 370fb08..08c80b5 100644
 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
 @@ -208,6 +208,10 @@ enum clk_ids {
@@ -366,7 +385,7 @@ index bc5eeb6..754d5b0 100644
  	DEF_MOD("csi20",		 714,	R8A7795_CLK_CSI0),
  	DEF_MOD("csi41",		 715,	R8A7795_CLK_CSI0),
 diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
-index acd9003..9c2cb94 100644
+index b7dbf7d..583d385 100644
 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
 @@ -187,6 +187,9 @@ enum clk_ids {
@@ -380,7 +399,7 @@ index acd9003..9c2cb94 100644
  	DEF_MOD("csi40",		 716,	R8A7796_CLK_CSI0),
  	DEF_MOD("du2",			 722,	R8A7796_CLK_S2D1),
 diff --git a/drivers/clk/renesas/r8a77965-cpg-mssr.c b/drivers/clk/renesas/r8a77965-cpg-mssr.c
-index eb71322..99f94a5 100644
+index 92a4772..7b0c8c7 100644
 --- a/drivers/clk/renesas/r8a77965-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a77965-cpg-mssr.c
 @@ -179,6 +179,9 @@ enum clk_ids {
@@ -394,7 +413,7 @@ index eb71322..99f94a5 100644
  	DEF_MOD("csi40",		 716,	R8A77965_CLK_CSI0),
  	DEF_MOD("du3",			 721,	R8A77965_CLK_S2D1),
 diff --git a/drivers/clk/renesas/r8a77990-cpg-mssr.c b/drivers/clk/renesas/r8a77990-cpg-mssr.c
-index 0f11d8a..ed1b828 100644
+index 3b35524..1222edc 100644
 --- a/drivers/clk/renesas/r8a77990-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a77990-cpg-mssr.c
 @@ -179,6 +179,8 @@ enum clk_ids {
@@ -2196,10 +2215,10 @@ index 0000000..4856277
 +	return ret;
 +}
 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
-index bcea7ee..8cb95b0 100644
+index 6eae2b4..3e8d9eb 100644
 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
-@@ -274,6 +274,19 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc)
+@@ -280,6 +280,19 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc)
  	rcar_du_crtc_write(rcrtc, HDSR, mode->htotal - mode->hsync_start - 19);
  	rcar_du_crtc_write(rcrtc, HDER, mode->htotal - mode->hsync_start +
  					mode->hdisplay - 19);
@@ -2219,7 +2238,7 @@ index bcea7ee..8cb95b0 100644
  	rcar_du_crtc_write(rcrtc, HSWR, mode->hsync_end -
  					mode->hsync_start - 1);
  	rcar_du_crtc_write(rcrtc, HCR,  mode->htotal - 1);
-@@ -518,6 +531,9 @@ static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc)
+@@ -524,6 +537,9 @@ static void rcar_du_crtc_start(struct rcar_du_crtc *rcrtc)
  		rcar_du_lvdsenc_enable(rcdu->lvds[rcrtc->index], crtc, true);
 
  	rcar_du_group_start_stop(rcrtc->group, true);
@@ -2229,7 +2248,7 @@ index bcea7ee..8cb95b0 100644
  }
 
  static void rcar_du_crtc_disable_planes(struct rcar_du_crtc *rcrtc)
-@@ -554,6 +570,9 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
+@@ -560,6 +576,9 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc)
  	struct drm_crtc *crtc = &rcrtc->crtc;
  	struct rcar_du_device *rcdu = rcrtc->group->dev;
 
@@ -2239,7 +2258,7 @@ index bcea7ee..8cb95b0 100644
  	/*
  	 * Disable all planes and wait for the change to take effect. This is
  	 * required as the plane enable registers are updated on vblank, and no
-@@ -773,6 +792,9 @@ static irqreturn_t rcar_du_crtc_irq(int irq, void *arg)
+@@ -779,6 +798,9 @@ static irqreturn_t rcar_du_crtc_irq(int irq, void *arg)
  			rcar_du_crtc_finish_page_flip(rcrtc);
  		}
 
@@ -2249,7 +2268,7 @@ index bcea7ee..8cb95b0 100644
  		ret = IRQ_HANDLED;
  	}
 
-@@ -876,5 +898,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
+@@ -899,5 +921,7 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int index)
  		return ret;
  	}
 
@@ -2258,19 +2277,19 @@ index bcea7ee..8cb95b0 100644
  	return 0;
  }
 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
-index 606a77e..d823956 100644
+index e131e9f..65f45f4 100644
 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
-@@ -67,6 +67,8 @@ struct rcar_du_crtc {
- 	struct rcar_du_vsp *vsp;
+@@ -69,6 +69,8 @@ struct rcar_du_crtc {
  	unsigned int vsp_pipe;
  	int lvds_ch;
+ 	bool extal_use;
 +
 +	void *cmm_handle;
  };
 
  #define to_rcar_crtc(c)	container_of(c, struct rcar_du_crtc, crtc)
-@@ -90,4 +92,34 @@ void rcar_du_crtc_route_output(struct drm_crtc *crtc,
+@@ -92,4 +94,34 @@ void rcar_du_crtc_route_output(struct drm_crtc *crtc,
  			       enum rcar_du_output output);
  void rcar_du_crtc_finish_page_flip(struct rcar_du_crtc *rcrtc);
 
@@ -2306,7 +2325,7 @@ index 606a77e..d823956 100644
 +
  #endif /* __RCAR_DU_CRTC_H__ */
 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
-index 439d929..d826dad 100644
+index a98e83c..50a9ad3 100644
 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
 @@ -93,7 +93,8 @@
@@ -2399,19 +2418,20 @@ index 439d929..d826dad 100644
  	.lastclose		= rcar_du_lastclose,
  	.gem_free_object_unlocked = drm_gem_cma_free_object,
  	.gem_vm_ops		= &drm_gem_cma_vm_ops,
-@@ -373,6 +404,11 @@ static int rcar_du_pm_suspend(struct device *dev)
+@@ -371,6 +402,12 @@ static int rcar_du_pm_shutdown(struct device *dev)
+ #if IS_ENABLED(CONFIG_DRM_RCAR_DW_HDMI)
+ 	struct drm_encoder *encoder;
  #endif
- 	int i;
- 
++	int i;
++
 +	if (rcar_du_has(rcdu, RCAR_DU_FEATURE_CMM)) {
 +		for (i = 0; i < rcdu->num_crtcs; ++i)
 +			rcar_du_cmm_pm_suspend(&rcdu->crtcs[i]);
 +	}
-+
+ 
  	drm_kms_helper_poll_disable(rcdu->ddev);
  	drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
-
-@@ -407,6 +443,12 @@ static int rcar_du_pm_resume(struct device *dev)
+@@ -418,6 +455,12 @@ static int rcar_du_pm_resume(struct device *dev)
  	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
  #if IS_ENABLED(CONFIG_DRM_RCAR_DW_HDMI)
  	struct drm_encoder *encoder;
@@ -2425,7 +2445,7 @@ index 439d929..d826dad 100644
  	list_for_each_entry(encoder,
  			    &rcdu->ddev->mode_config.encoder_list,
 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
-index 2d37bf7..f63d05c 100644
+index bb3fb3d..4cf35f8 100644
 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
 @@ -36,8 +36,16 @@
@@ -2464,7 +2484,7 @@ index df407f4..321abb4 100644
  	 * Use DS1PR and DS2PR to configure planes priorities and connects the
  	 * superposition 0 to DU0 pins. DU1 pins will be configured dynamically.
 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
-index d5bae99..262f0c4 100644
+index 89d3024..e5aae46 100644
 --- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h
 @@ -200,6 +200,11 @@
@@ -2479,7 +2499,7 @@ index d5bae99..262f0c4 100644
  /* -----------------------------------------------------------------------------
   * R8A7790-only Control Registers
   */
-@@ -552,4 +557,91 @@
+@@ -553,4 +558,91 @@
  #define GCBCR			0x11098
  #define BCBCR			0x1109c
 

diff --git a/tmp/du_cmm b/tmp/du_cmm