2018-11-12 18:43:14

by Jorge Ramirez-Ortiz

Subject: [PATCH] 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(-)

diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
index 514245e..acbbad3 100644
--- a/drivers/gpu/drm/meson/meson_venc.c
+++ b/drivers/gpu/drm/meson/meson_venc.c
@@ -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 */
--
2.7.4

2018-11-13 08:35:43

by Neil Armstrong

Subject: Re: [PATCH] drm/meson: venc: dmt mode must use encp

On 12/11/2018 19:41, Jorge Ramirez-Ortiz wrote:
> 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(-)
>
> diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
> index 514245e..acbbad3 100644
> --- a/drivers/gpu/drm/meson/meson_venc.c
> +++ b/drivers/gpu/drm/meson/meson_venc.c
> @@ -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 */
>

Thanks !

Acked-by: Neil Armstrong <[email protected]>

I'll apply to drm-misc-fixes !

Neil

2018-11-13 13:33:08

by Neil Armstrong

Subject: Re: [PATCH] drm/meson: venc: dmt mode must use encp

On 13/11/2018 09:35, Neil Armstrong wrote:
> On 12/11/2018 19:41, Jorge Ramirez-Ortiz wrote:
>> 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(-)
>>
>> diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c
>> index 514245e..acbbad3 100644
>> --- a/drivers/gpu/drm/meson/meson_venc.c
>> +++ b/drivers/gpu/drm/meson/meson_venc.c
>> @@ -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 */
>>
>
> Thanks !
>
> Acked-by: Neil Armstrong <[email protected]>
>
> I'll apply to drm-misc-fixes !
>
> Neil
>

Applied.