linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/1] drm/rockchip: vop: add the definition of dclk_pol
@ 2019-10-10  3:44 Nickey Yang
  2019-10-10  3:44 ` [PATCH 1/1] " Nickey Yang
  0 siblings, 1 reply; 5+ messages in thread
From: Nickey Yang @ 2019-10-10  3:44 UTC (permalink / raw)
  To: heiko, hjc
  Cc: linux-kernel, dri-devel, linux-rockchip, nickey.yang, seanpaul,
	laurent.pinchart


Nickey Yang (1):
  drm/rockchip: vop: add the definition of dclk_pol

 drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 12 +++---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h |  8 +++-
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 45 ++++++++++++++-------
 3 files changed, 43 insertions(+), 22 deletions(-)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol
  2019-10-10  3:44 [PATCH 0/1] drm/rockchip: vop: add the definition of dclk_pol Nickey Yang
@ 2019-10-10  3:44 ` Nickey Yang
  2019-10-10 23:46   ` Heiko Stübner
                     ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Nickey Yang @ 2019-10-10  3:44 UTC (permalink / raw)
  To: heiko, hjc
  Cc: linux-kernel, dri-devel, linux-rockchip, nickey.yang, seanpaul,
	laurent.pinchart

Some VOP's (such as px30) dclk_pol bit is at the last.
So it is necessary to distinguish dclk_pol and pin_pol.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 12 +++---
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h |  8 +++-
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 45 ++++++++++++++-------
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 613404f86668..0d6682ed9e15 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1085,9 +1085,7 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
 		DRM_DEV_ERROR(vop->dev, "Failed to enable vop (%d)\n", ret);
 		return;
 	}
-
-	pin_pol = BIT(DCLK_INVERT);
-	pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) ?
+	pin_pol = (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) ?
 		   BIT(HSYNC_POSITIVE) : 0;
 	pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) ?
 		   BIT(VSYNC_POSITIVE) : 0;
@@ -1096,25 +1094,29 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
 
 	switch (s->output_type) {
 	case DRM_MODE_CONNECTOR_LVDS:
-		VOP_REG_SET(vop, output, rgb_en, 1);
+		VOP_REG_SET(vop, output, rgb_dclk_pol, 1);
 		VOP_REG_SET(vop, output, rgb_pin_pol, pin_pol);
+		VOP_REG_SET(vop, output, rgb_en, 1);
 		break;
 	case DRM_MODE_CONNECTOR_eDP:
+		VOP_REG_SET(vop, output, edp_dclk_pol, 1);
 		VOP_REG_SET(vop, output, edp_pin_pol, pin_pol);
 		VOP_REG_SET(vop, output, edp_en, 1);
 		break;
 	case DRM_MODE_CONNECTOR_HDMIA:
+		VOP_REG_SET(vop, output, hdmi_dclk_pol, 1);
 		VOP_REG_SET(vop, output, hdmi_pin_pol, pin_pol);
 		VOP_REG_SET(vop, output, hdmi_en, 1);
 		break;
 	case DRM_MODE_CONNECTOR_DSI:
+		VOP_REG_SET(vop, output, mipi_dclk_pol, 1);
 		VOP_REG_SET(vop, output, mipi_pin_pol, pin_pol);
 		VOP_REG_SET(vop, output, mipi_en, 1);
 		VOP_REG_SET(vop, output, mipi_dual_channel_en,
 			    !!(s->output_flags & ROCKCHIP_OUTPUT_DSI_DUAL));
 		break;
 	case DRM_MODE_CONNECTOR_DisplayPort:
-		pin_pol &= ~BIT(DCLK_INVERT);
+		VOP_REG_SET(vop, output, dp_dclk_pol, 0);
 		VOP_REG_SET(vop, output, dp_pin_pol, pin_pol);
 		VOP_REG_SET(vop, output, dp_en, 1);
 		break;
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
index 2149a889c29d..ea1f97a5aa5d 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
@@ -46,10 +46,15 @@ struct vop_modeset {
 struct vop_output {
 	struct vop_reg pin_pol;
 	struct vop_reg dp_pin_pol;
+	struct vop_reg dp_dclk_pol;
 	struct vop_reg edp_pin_pol;
+	struct vop_reg edp_dclk_pol;
 	struct vop_reg hdmi_pin_pol;
+	struct vop_reg hdmi_dclk_pol;
 	struct vop_reg mipi_pin_pol;
+	struct vop_reg mipi_dclk_pol;
 	struct vop_reg rgb_pin_pol;
+	struct vop_reg rgb_dclk_pol;
 	struct vop_reg dp_en;
 	struct vop_reg edp_en;
 	struct vop_reg hdmi_en;
@@ -294,8 +299,7 @@ enum dither_down_mode_sel {
 enum vop_pol {
 	HSYNC_POSITIVE = 0,
 	VSYNC_POSITIVE = 1,
-	DEN_NEGATIVE   = 2,
-	DCLK_INVERT    = 3
+	DEN_NEGATIVE   = 2
 };
 
 #define FRAC_16_16(mult, div)    (((mult) << 16) / (div))
diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
index d1494be14471..f92c899d656c 100644
--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
@@ -214,9 +214,11 @@ static const struct vop_modeset px30_modeset = {
 };
 
 static const struct vop_output px30_output = {
-	.rgb_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0xf, 1),
-	.mipi_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0xf, 25),
+	.rgb_dclk_pol = VOP_REG(PX30_DSP_CTRL0, 0x1, 1),
+	.rgb_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0x7, 2),
 	.rgb_en = VOP_REG(PX30_DSP_CTRL0, 0x1, 0),
+	.mipi_dclk_pol = VOP_REG(PX30_DSP_CTRL0, 0x1, 25),
+	.mipi_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0x7, 26),
 	.mipi_en = VOP_REG(PX30_DSP_CTRL0, 0x1, 24),
 };
 
@@ -717,10 +719,14 @@ static const struct vop_win_data rk3368_vop_win_data[] = {
 };
 
 static const struct vop_output rk3368_output = {
-	.rgb_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 16),
-	.hdmi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 20),
-	.edp_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 24),
-	.mipi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 28),
+	.rgb_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 19),
+	.hdmi_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 23),
+	.edp_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 27),
+	.mipi_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 31),
+	.rgb_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 16),
+	.hdmi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 20),
+	.edp_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 24),
+	.mipi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 28),
 	.rgb_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 12),
 	.hdmi_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 13),
 	.edp_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 14),
@@ -764,11 +770,16 @@ static const struct vop_data rk3366_vop = {
 };
 
 static const struct vop_output rk3399_output = {
-	.dp_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 16),
-	.rgb_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 16),
-	.hdmi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 20),
-	.edp_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 24),
-	.mipi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 28),
+	.dp_dclk_pol = VOP_REG(RK3399_DSP_CTRL1, 0x1, 19),
+	.rgb_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 19),
+	.hdmi_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 23),
+	.edp_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 27),
+	.mipi_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 31),
+	.dp_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0x7, 16),
+	.rgb_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 16),
+	.hdmi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 20),
+	.edp_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 24),
+	.mipi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 28),
 	.dp_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 11),
 	.rgb_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 12),
 	.hdmi_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 13),
@@ -872,14 +883,18 @@ static const struct vop_modeset rk3328_modeset = {
 };
 
 static const struct vop_output rk3328_output = {
+	.rgb_dclk_pol = VOP_REG(RK3328_DSP_CTRL1, 0x1, 19),
+	.hdmi_dclk_pol = VOP_REG(RK3328_DSP_CTRL1, 0x1, 23),
+	.edp_dclk_pol = VOP_REG(RK3328_DSP_CTRL1, 0x1, 27),
+	.mipi_dclk_pol = VOP_REG(RK3328_DSP_CTRL1, 0x1, 31),
 	.rgb_en = VOP_REG(RK3328_SYS_CTRL, 0x1, 12),
 	.hdmi_en = VOP_REG(RK3328_SYS_CTRL, 0x1, 13),
 	.edp_en = VOP_REG(RK3328_SYS_CTRL, 0x1, 14),
 	.mipi_en = VOP_REG(RK3328_SYS_CTRL, 0x1, 15),
-	.rgb_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0xf, 16),
-	.hdmi_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0xf, 20),
-	.edp_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0xf, 24),
-	.mipi_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0xf, 28),
+	.rgb_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0x7, 16),
+	.hdmi_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0x7, 20),
+	.edp_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0x7, 24),
+	.mipi_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0x7, 28),
 };
 
 static const struct vop_misc rk3328_misc = {
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol
  2019-10-10  3:44 ` [PATCH 1/1] " Nickey Yang
@ 2019-10-10 23:46   ` Heiko Stübner
  2019-10-11  3:55   ` [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol【请注意，邮件由linux-rockchip-bounces+sandy.huang=rock-chips.com@lists.infradead.org代发】 sandy.huang
  2019-10-13 22:03   ` [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol Heiko Stuebner
  2 siblings, 0 replies; 5+ messages in thread
From: Heiko Stübner @ 2019-10-10 23:46 UTC (permalink / raw)
  To: Nickey Yang
  Cc: hjc, linux-kernel, dri-devel, linux-rockchip, seanpaul, laurent.pinchart

Am Donnerstag, 10. Oktober 2019, 05:44:52 CEST schrieb Nickey Yang:
> Some VOP's (such as px30) dclk_pol bit is at the last.
> So it is necessary to distinguish dclk_pol and pin_pol.
> 
> Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

on
- px30 with dsi ... fixing the display issue I had
- rk3328 with hdmi
- rk3288 with edp
- rk3399 with edp

Tested-by: Heiko Stuebner <heiko@sntech.de>



^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol【请注意，邮件由linux-rockchip-bounces+sandy.huang=rock-chips.com@lists.infradead.org代发】
  2019-10-10  3:44 ` [PATCH 1/1] " Nickey Yang
  2019-10-10 23:46   ` Heiko Stübner
@ 2019-10-11  3:55   ` sandy.huang
  2019-10-13 22:03   ` [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol Heiko Stuebner
  2 siblings, 0 replies; 5+ messages in thread
From: sandy.huang @ 2019-10-11  3:55 UTC (permalink / raw)
  To: Nickey Yang, heiko
  Cc: linux-kernel, dri-devel, linux-rockchip, seanpaul, laurent.pinchart

Reviewed-by: Sandy Huang <hjc@rock-chips.com>

在 2019/10/10 上午11:44, Nickey Yang 写道:
> Some VOP's (such as px30) dclk_pol bit is at the last.
> So it is necessary to distinguish dclk_pol and pin_pol.
>
> Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
> ---
>   drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 12 +++---
>   drivers/gpu/drm/rockchip/rockchip_drm_vop.h |  8 +++-
>   drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 45 ++++++++++++++-------
>   3 files changed, 43 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> index 613404f86668..0d6682ed9e15 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
> @@ -1085,9 +1085,7 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
>   		DRM_DEV_ERROR(vop->dev, "Failed to enable vop (%d)\n", ret);
>   		return;
>   	}
> -
> -	pin_pol = BIT(DCLK_INVERT);
> -	pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) ?
> +	pin_pol = (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) ?
>   		   BIT(HSYNC_POSITIVE) : 0;
>   	pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) ?
>   		   BIT(VSYNC_POSITIVE) : 0;
> @@ -1096,25 +1094,29 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
>   
>   	switch (s->output_type) {
>   	case DRM_MODE_CONNECTOR_LVDS:
> -		VOP_REG_SET(vop, output, rgb_en, 1);
> +		VOP_REG_SET(vop, output, rgb_dclk_pol, 1);
>   		VOP_REG_SET(vop, output, rgb_pin_pol, pin_pol);
> +		VOP_REG_SET(vop, output, rgb_en, 1);
>   		break;
>   	case DRM_MODE_CONNECTOR_eDP:
> +		VOP_REG_SET(vop, output, edp_dclk_pol, 1);
>   		VOP_REG_SET(vop, output, edp_pin_pol, pin_pol);
>   		VOP_REG_SET(vop, output, edp_en, 1);
>   		break;
>   	case DRM_MODE_CONNECTOR_HDMIA:
> +		VOP_REG_SET(vop, output, hdmi_dclk_pol, 1);
>   		VOP_REG_SET(vop, output, hdmi_pin_pol, pin_pol);
>   		VOP_REG_SET(vop, output, hdmi_en, 1);
>   		break;
>   	case DRM_MODE_CONNECTOR_DSI:
> +		VOP_REG_SET(vop, output, mipi_dclk_pol, 1);
>   		VOP_REG_SET(vop, output, mipi_pin_pol, pin_pol);
>   		VOP_REG_SET(vop, output, mipi_en, 1);
>   		VOP_REG_SET(vop, output, mipi_dual_channel_en,
>   			    !!(s->output_flags & ROCKCHIP_OUTPUT_DSI_DUAL));
>   		break;
>   	case DRM_MODE_CONNECTOR_DisplayPort:
> -		pin_pol &= ~BIT(DCLK_INVERT);
> +		VOP_REG_SET(vop, output, dp_dclk_pol, 0);
>   		VOP_REG_SET(vop, output, dp_pin_pol, pin_pol);
>   		VOP_REG_SET(vop, output, dp_en, 1);
>   		break;
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> index 2149a889c29d..ea1f97a5aa5d 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
> @@ -46,10 +46,15 @@ struct vop_modeset {
>   struct vop_output {
>   	struct vop_reg pin_pol;
>   	struct vop_reg dp_pin_pol;
> +	struct vop_reg dp_dclk_pol;
>   	struct vop_reg edp_pin_pol;
> +	struct vop_reg edp_dclk_pol;
>   	struct vop_reg hdmi_pin_pol;
> +	struct vop_reg hdmi_dclk_pol;
>   	struct vop_reg mipi_pin_pol;
> +	struct vop_reg mipi_dclk_pol;
>   	struct vop_reg rgb_pin_pol;
> +	struct vop_reg rgb_dclk_pol;
>   	struct vop_reg dp_en;
>   	struct vop_reg edp_en;
>   	struct vop_reg hdmi_en;
> @@ -294,8 +299,7 @@ enum dither_down_mode_sel {
>   enum vop_pol {
>   	HSYNC_POSITIVE = 0,
>   	VSYNC_POSITIVE = 1,
> -	DEN_NEGATIVE   = 2,
> -	DCLK_INVERT    = 3
> +	DEN_NEGATIVE   = 2
>   };
>   
>   #define FRAC_16_16(mult, div)    (((mult) << 16) / (div))
> diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> index d1494be14471..f92c899d656c 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
> @@ -214,9 +214,11 @@ static const struct vop_modeset px30_modeset = {
>   };
>   
>   static const struct vop_output px30_output = {
> -	.rgb_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0xf, 1),
> -	.mipi_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0xf, 25),
> +	.rgb_dclk_pol = VOP_REG(PX30_DSP_CTRL0, 0x1, 1),
> +	.rgb_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0x7, 2),
>   	.rgb_en = VOP_REG(PX30_DSP_CTRL0, 0x1, 0),
> +	.mipi_dclk_pol = VOP_REG(PX30_DSP_CTRL0, 0x1, 25),
> +	.mipi_pin_pol = VOP_REG(PX30_DSP_CTRL0, 0x7, 26),
>   	.mipi_en = VOP_REG(PX30_DSP_CTRL0, 0x1, 24),
>   };
>   
> @@ -717,10 +719,14 @@ static const struct vop_win_data rk3368_vop_win_data[] = {
>   };
>   
>   static const struct vop_output rk3368_output = {
> -	.rgb_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 16),
> -	.hdmi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 20),
> -	.edp_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 24),
> -	.mipi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 28),
> +	.rgb_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 19),
> +	.hdmi_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 23),
> +	.edp_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 27),
> +	.mipi_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 31),
> +	.rgb_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 16),
> +	.hdmi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 20),
> +	.edp_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 24),
> +	.mipi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 28),
>   	.rgb_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 12),
>   	.hdmi_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 13),
>   	.edp_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 14),
> @@ -764,11 +770,16 @@ static const struct vop_data rk3366_vop = {
>   };
>   
>   static const struct vop_output rk3399_output = {
> -	.dp_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0xf, 16),
> -	.rgb_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 16),
> -	.hdmi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 20),
> -	.edp_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 24),
> -	.mipi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0xf, 28),
> +	.dp_dclk_pol = VOP_REG(RK3399_DSP_CTRL1, 0x1, 19),
> +	.rgb_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 19),
> +	.hdmi_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 23),
> +	.edp_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 27),
> +	.mipi_dclk_pol = VOP_REG(RK3368_DSP_CTRL1, 0x1, 31),
> +	.dp_pin_pol = VOP_REG(RK3399_DSP_CTRL1, 0x7, 16),
> +	.rgb_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 16),
> +	.hdmi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 20),
> +	.edp_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 24),
> +	.mipi_pin_pol = VOP_REG(RK3368_DSP_CTRL1, 0x7, 28),
>   	.dp_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 11),
>   	.rgb_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 12),
>   	.hdmi_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 13),
> @@ -872,14 +883,18 @@ static const struct vop_modeset rk3328_modeset = {
>   };
>   
>   static const struct vop_output rk3328_output = {
> +	.rgb_dclk_pol = VOP_REG(RK3328_DSP_CTRL1, 0x1, 19),
> +	.hdmi_dclk_pol = VOP_REG(RK3328_DSP_CTRL1, 0x1, 23),
> +	.edp_dclk_pol = VOP_REG(RK3328_DSP_CTRL1, 0x1, 27),
> +	.mipi_dclk_pol = VOP_REG(RK3328_DSP_CTRL1, 0x1, 31),
>   	.rgb_en = VOP_REG(RK3328_SYS_CTRL, 0x1, 12),
>   	.hdmi_en = VOP_REG(RK3328_SYS_CTRL, 0x1, 13),
>   	.edp_en = VOP_REG(RK3328_SYS_CTRL, 0x1, 14),
>   	.mipi_en = VOP_REG(RK3328_SYS_CTRL, 0x1, 15),
> -	.rgb_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0xf, 16),
> -	.hdmi_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0xf, 20),
> -	.edp_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0xf, 24),
> -	.mipi_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0xf, 28),
> +	.rgb_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0x7, 16),
> +	.hdmi_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0x7, 20),
> +	.edp_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0x7, 24),
> +	.mipi_pin_pol = VOP_REG(RK3328_DSP_CTRL1, 0x7, 28),
>   };
>   
>   static const struct vop_misc rk3328_misc = {



^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol
  2019-10-10  3:44 ` [PATCH 1/1] " Nickey Yang
  2019-10-10 23:46   ` Heiko Stübner
  2019-10-11  3:55   ` [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol【请注意，邮件由linux-rockchip-bounces+sandy.huang=rock-chips.com@lists.infradead.org代发】 sandy.huang
@ 2019-10-13 22:03   ` Heiko Stuebner
  2 siblings, 0 replies; 5+ messages in thread
From: Heiko Stuebner @ 2019-10-13 22:03 UTC (permalink / raw)
  To: Nickey Yang
  Cc: hjc, linux-kernel, dri-devel, linux-rockchip, seanpaul, laurent.pinchart

Am Donnerstag, 10. Oktober 2019, 05:44:52 CEST schrieb Nickey Yang:
> Some VOP's (such as px30) dclk_pol bit is at the last.
> So it is necessary to distinguish dclk_pol and pin_pol.
> 
> Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>

applied to drm-misc-next with Sandy's Reviewed-by

Thanks
Heiko



^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-13 22:03 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-10  3:44 [PATCH 0/1] drm/rockchip: vop: add the definition of dclk_pol Nickey Yang
2019-10-10  3:44 ` [PATCH 1/1] " Nickey Yang
2019-10-10 23:46   ` Heiko Stübner
2019-10-11  3:55   ` [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol【请注意，邮件由linux-rockchip-bounces+sandy.huang=rock-chips.com@lists.infradead.org代发】 sandy.huang
2019-10-13 22:03   ` [PATCH 1/1] drm/rockchip: vop: add the definition of dclk_pol Heiko Stuebner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).