Skip to contentSkip to conversation

drm/meson: venc: dmt mode must use encp

PATCH Applied Jorge Ramirez-Ortiz 2 participants 3 messages Nov 12, 2018 – Nov 13, 2018

Subsystems (4)
DRM drivers DRM misc Arm/Amlogic Meson SoC support DRM drivers for Amlogic SoCs
lore
Share & tools
lore

Jorge Ramirez-Ortiz

author
#0 lore raw

PATCH 1/1 drm/meson: venc: dmt mode must use encp

From: Jorge Ramirez-Ortiz <[email protected]>

The video mode for DMT is only populated to support encp.

Signed-off-by Jorge Ramirez-Ortiz <[email protected]>
---
 drivers/gpu/drm/meson/meson_venc.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/meson/meson_venc.c +8 -7
index 514245e..acbbad3 100644
@@ -854,6 +854,13 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,
 	unsigned int sof_lines;
 	unsigned int vsync_lines;
 
+	/* Use VENCI for 480i and 576i and double HDMI pixels */
+	if (mode->flags & DRM_MODE_FLAG_DBLCLK) {
+		hdmi_repeat = true;
+		use_enci = true;
+		venc_hdmi_latency = 1;
+	}
+
 	if (meson_venc_hdmi_supported_vic(vic)) {
 		vmode = meson_venc_hdmi_get_vic_vmode(vic);
 		if (!vmode) {

@@ -865,13 +872,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,
 	} else {
 		meson_venc_hdmi_get_dmt_vmode(mode, &vmode_dmt);
 		vmode = &vmode_dmt;
-	}
-
-	/* Use VENCI for 480i and 576i and double HDMI pixels */
-	if (mode->flags & DRM_MODE_FLAG_DBLCLK) {
-		hdmi_repeat = true;
-		use_enci = true;
-		venc_hdmi_latency = 1;
+		use_enci = false;
 	}
 
 	/* Repeat VENC pixels for 480/576i/p, 720p50/60 and 1080p50/60 */
Signature · 1 line
2.7.4
Acked-by on v1 1/1
#1 lore raw
Quoted 33 lines · Jorge Ramirez-Ortiz

From: Jorge Ramirez-Ortiz <[email protected]>

The video mode for DMT is only populated to support encp.

Signed-off-by Jorge Ramirez-Ortiz <[email protected]>
---
 drivers/gpu/drm/meson/meson_venc.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/meson/meson_venc.c +7 -1
index 514245e..acbbad3 100644
@@ -854,6 +854,13 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,
 	unsigned int sof_lines;
 	unsigned int vsync_lines;
 
+	/* Use VENCI for 480i and 576i and double HDMI pixels */
+	if (mode->flags & DRM_MODE_FLAG_DBLCLK) {
+		hdmi_repeat = true;
+		use_enci = true;
+		venc_hdmi_latency = 1;
+	}
+
 	if (meson_venc_hdmi_supported_vic(vic)) {
 		vmode = meson_venc_hdmi_get_vic_vmode(vic);
 		if (!vmode) {

@@ -865,13 +872,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,
 	} else {
 		meson_venc_hdmi_get_dmt_vmode(mode, &vmode_dmt);
 		vmode = &vmode_dmt;
-	}

drivers/gpu/drm/meson/meson_venc.c void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, · line 878

Quoted 10 lines
drivers/gpu/drm/meson/meson_venc.c +1 -6
-
-	/* Use VENCI for 480i and 576i and double HDMI pixels */
-	if (mode->flags & DRM_MODE_FLAG_DBLCLK) {
-		hdmi_repeat = true;
-		use_enci = true;
-		venc_hdmi_latency = 1;
+		use_enci = false;
 	}
 
 	/* Repeat VENC pixels for 480/576i/p, 720p50/60 and 1080p50/60 */

Thanks !

Acked-by Neil Armstrong <[email protected]>

I'll apply to drm-misc-fixes !

Neil

Applied
#2 lore raw
Quoted 47 lines · Neil Armstrong
Quoted 33 lines · Jorge Ramirez-Ortiz

From: Jorge Ramirez-Ortiz <[email protected]>

The video mode for DMT is only populated to support encp.

Signed-off-by Jorge Ramirez-Ortiz <[email protected]>
---
 drivers/gpu/drm/meson/meson_venc.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/meson/meson_venc.c +7 -1
index 514245e..acbbad3 100644
@@ -854,6 +854,13 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,
 	unsigned int sof_lines;
 	unsigned int vsync_lines;
 
+	/* Use VENCI for 480i and 576i and double HDMI pixels */
+	if (mode->flags & DRM_MODE_FLAG_DBLCLK) {
+		hdmi_repeat = true;
+		use_enci = true;
+		venc_hdmi_latency = 1;
+	}
+
 	if (meson_venc_hdmi_supported_vic(vic)) {
 		vmode = meson_venc_hdmi_get_vic_vmode(vic);
 		if (!vmode) {

@@ -865,13 +872,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,
 	} else {
 		meson_venc_hdmi_get_dmt_vmode(mode, &vmode_dmt);
 		vmode = &vmode_dmt;
-	}

drivers/gpu/drm/meson/meson_venc.c void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, · line 878

Quoted 10 lines
drivers/gpu/drm/meson/meson_venc.c +1 -6
-
-	/* Use VENCI for 480i and 576i and double HDMI pixels */
-	if (mode->flags & DRM_MODE_FLAG_DBLCLK) {
-		hdmi_repeat = true;
-		use_enci = true;
-		venc_hdmi_latency = 1;
+		use_enci = false;
 	}
 
 	/* Repeat VENC pixels for 480/576i/p, 720p50/60 and 1080p50/60 */

Thanks !

Quoted 6 lines
Acked-by Neil Armstrong <[email protected]>

I'll apply to drm-misc-fixes !

Neil

Applied.