thr3ads.net - Nouveau - [Nouveau] [PATCH v7 22/23] drm/vc4: vec: Add support for more analog TV standards [Nov 2022]

If this information is useful, please help other people find it:
Share via:

Mateusz Kwiatkowski

2022-Nov-09 01:15 UTC

[Nouveau] [PATCH v7 22/23] drm/vc4: vec: Add support for more analog TV standards

Hi Maxime,

I ran your v7 patchset on my Pi with Xorg, and the mode switching, as well as
the preferred mode handling, all work really well now!

I just noted that the downstream version of the vc4 driver still has inaccurate
field delays in vc4_crtc.c, which causes vertical lines to appear jagged (like
here:
https://user-images.githubusercontent.com/4499762/112738569-385c3280-8f64-11eb-83c4-d671537af209.png).
This has been fixed downstream in
https://github.com/raspberrypi/linux/pull/4241/commits/bc093f27bf2613ec93524fdc19e922dd7dd3d800,
but I guess that should be upstreamed separately...?

Anyway, it's unrelated to the changes made in this patchset, so... I'm
not sure
if I'm qualified or allowed to do these, but just in case:

Tested-by: Mateusz Kwiatkowski <kfyatek+publicgit at gmail.com>

(that pretty much applies to parts 19-22 in general, I can respond to those
messages as well if you wish)

Best regards,
Mateusz Kwiatkowski

W dniu 7.11.2022 o 15:16, Maxime Ripard pisze:> From: Mateusz Kwiatkowski <kfyatek+publicgit at gmail.com>
>
> Add support for the following composite output modes (all of them are
> somewhat more obscure than the previously defined ones):
>
> - NTSC_443 - NTSC-style signal with the chroma subcarrier shifted to
>   4.43361875 MHz (the PAL subcarrier frequency). Never used for
>   broadcasting, but sometimes used as a hack to play NTSC content in PAL
>   regions (e.g. on VCRs).
> - PAL_N - PAL with alternative chroma subcarrier frequency,
>   3.58205625 MHz. Used as a broadcast standard in Argentina, Paraguay
>   and Uruguay to fit 576i50 with colour in 6 MHz channel raster.
> - PAL60 - 480i60 signal with PAL-style color at normal European PAL
>   frequency. Another non-standard, non-broadcast mode, used in similar
>   contexts as NTSC_443. Some displays support one but not the other.
> - SECAM - French frequency-modulated analog color standard; also have
>   been broadcast in Eastern Europe and various parts of Africa and Asia.
>   Uses the same 576i50 timings as PAL.
>
> Also added some comments explaining color subcarrier frequency
> registers.
>
> Acked-by: Noralf Tr?nnes <noralf at tronnes.org>
> Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit at gmail.com>
> Signed-off-by: Maxime Ripard <maxime at cerno.tech>
>
> ---
> Changes in v6:
> - Support PAL60 again
> ---
>  drivers/gpu/drm/vc4/vc4_vec.c | 111
++++++++++++++++++++++++++++++++++++++++--
>  1 file changed, 107 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
> index a828fc6fb776..d23dbad3cbf6 100644
> --- a/drivers/gpu/drm/vc4/vc4_vec.c
> +++ b/drivers/gpu/drm/vc4/vc4_vec.c
> @@ -46,6 +46,7 @@
>  #define VEC_CONFIG0_YDEL(x)		((x) << 26)
>  #define VEC_CONFIG0_CDEL_MASK		GENMASK(25, 24)
>  #define VEC_CONFIG0_CDEL(x)		((x) << 24)
> +#define VEC_CONFIG0_SECAM_STD		BIT(21)
>  #define VEC_CONFIG0_PBPR_FIL		BIT(18)
>  #define VEC_CONFIG0_CHROMA_GAIN_MASK	GENMASK(17, 16)
>  #define VEC_CONFIG0_CHROMA_GAIN_UNITY	(0 << 16)
> @@ -76,6 +77,27 @@
>  #define VEC_SOFT_RESET			0x10c
>  #define VEC_CLMP0_START			0x144
>  #define VEC_CLMP0_END			0x148
> +
> +/*
> + * These set the color subcarrier frequency
> + * if VEC_CONFIG1_CUSTOM_FREQ is enabled.
> + *
> + * VEC_FREQ1_0 contains the most significant 16-bit half-word,
> + * VEC_FREQ3_2 contains the least significant 16-bit half-word.
> + * 0x80000000 seems to be equivalent to the pixel clock
> + * (which itself is the VEC clock divided by 8).
> + *
> + * Reference values (with the default pixel clock of 13.5 MHz):
> + *
> + * NTSC  (3579545.[45] Hz)     - 0x21F07C1F
> + * PAL   (4433618.75 Hz)       - 0x2A098ACB
> + * PAL-M (3575611.[888111] Hz) - 0x21E6EFE3
> + * PAL-N (3582056.25 Hz)       - 0x21F69446
> + *
> + * NOTE: For SECAM, it is used as the Dr center frequency,
> + * regardless of whether VEC_CONFIG1_CUSTOM_FREQ is enabled or not;
> + * that is specified as 4406250 Hz, which corresponds to 0x29C71C72.
> + */
>  #define VEC_FREQ3_2			0x180
>  #define VEC_FREQ1_0			0x184
>  
> @@ -118,6 +140,14 @@
>  
>  #define VEC_INTERRUPT_CONTROL		0x190
>  #define VEC_INTERRUPT_STATUS		0x194
> +
> +/*
> + * Db center frequency for SECAM; the clock for this is the same as for
> + * VEC_FREQ3_2/VEC_FREQ1_0, which is used for Dr center frequency.
> + *
> + * This is specified as 4250000 Hz, which corresponds to 0x284BDA13.
> + * That is also the default value, so no need to set it explicitly.
> + */
>  #define VEC_FCW_SECAM_B			0x198
>  #define VEC_SECAM_GAIN_VAL		0x19c
>  
> @@ -197,10 +227,15 @@ enum vc4_vec_tv_mode_id {
>  	VC4_VEC_TV_MODE_NTSC_J,
>  	VC4_VEC_TV_MODE_PAL,
>  	VC4_VEC_TV_MODE_PAL_M,
> +	VC4_VEC_TV_MODE_NTSC_443,
> +	VC4_VEC_TV_MODE_PAL_60,
> +	VC4_VEC_TV_MODE_PAL_N,
> +	VC4_VEC_TV_MODE_SECAM,
>  };
>  
>  struct vc4_vec_tv_mode {
>  	unsigned int mode;
> +	u16 expected_htotal;
>  	u32 config0;
>  	u32 config1;
>  	u32 custom_freq;
> @@ -236,35 +271,68 @@ static const struct debugfs_reg32 vec_regs[] = {
>  static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
>  	{
>  		.mode = DRM_MODE_TV_MODE_NTSC,
> +		.expected_htotal = 858,
>  		.config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN,
>  		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
>  	},
> +	{
> +		.mode = DRM_MODE_TV_MODE_NTSC_443,
> +		.expected_htotal = 858,
> +		.config0 = VEC_CONFIG0_NTSC_STD,
> +		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
> +		.custom_freq = 0x2a098acb,
> +	},
>  	{
>  		.mode = DRM_MODE_TV_MODE_NTSC_J,
> +		.expected_htotal = 858,
>  		.config0 = VEC_CONFIG0_NTSC_STD,
>  		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
>  	},
>  	{
>  		.mode = DRM_MODE_TV_MODE_PAL,
> +		.expected_htotal = 864,
>  		.config0 = VEC_CONFIG0_PAL_BDGHI_STD,
>  		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
>  	},
> +	{
> +		/* PAL-60 */
> +		.mode = DRM_MODE_TV_MODE_PAL,
> +		.expected_htotal = 858,
> +		.config0 = VEC_CONFIG0_PAL_M_STD,
> +		.config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ,
> +		.custom_freq = 0x2a098acb,
> +	},
>  	{
>  		.mode = DRM_MODE_TV_MODE_PAL_M,
> +		.expected_htotal = 858,
>  		.config0 = VEC_CONFIG0_PAL_M_STD,
>  		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
>  	},
> +	{
> +		.mode = DRM_MODE_TV_MODE_PAL_N,
> +		.expected_htotal = 864,
> +		.config0 = VEC_CONFIG0_PAL_N_STD,
> +		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
> +	},
> +	{
> +		.mode = DRM_MODE_TV_MODE_SECAM,
> +		.expected_htotal = 864,
> +		.config0 = VEC_CONFIG0_SECAM_STD,
> +		.config1 = VEC_CONFIG1_C_CVBS_CVBS,
> +		.custom_freq = 0x29c71c72,
> +	},
>  };
>  
>  static inline const struct vc4_vec_tv_mode *
> -vc4_vec_tv_mode_lookup(unsigned int mode)
> +vc4_vec_tv_mode_lookup(unsigned int mode, u16 htotal)
>  {
>  	unsigned int i;
>  
>  	for (i = 0; i < ARRAY_SIZE(vc4_vec_tv_modes); i++) {
>  		const struct vc4_vec_tv_mode *tv_mode = &vc4_vec_tv_modes[i];
>  
> -		if (tv_mode->mode == mode)
> +		if (tv_mode->mode == mode &&
> +		    tv_mode->expected_htotal == htotal)
>  			return tv_mode;
>  	}
>  
> @@ -273,9 +341,13 @@ vc4_vec_tv_mode_lookup(unsigned int mode)
>  
>  static const struct drm_prop_enum_list legacy_tv_mode_names[] = {
>  	{ VC4_VEC_TV_MODE_NTSC, "NTSC", },
> +	{ VC4_VEC_TV_MODE_NTSC_443, "NTSC-443", },
>  	{ VC4_VEC_TV_MODE_NTSC_J, "NTSC-J", },
>  	{ VC4_VEC_TV_MODE_PAL, "PAL", },
> +	{ VC4_VEC_TV_MODE_PAL_60, "PAL-60", },
>  	{ VC4_VEC_TV_MODE_PAL_M, "PAL-M", },
> +	{ VC4_VEC_TV_MODE_PAL_N, "PAL-N", },
> +	{ VC4_VEC_TV_MODE_SECAM, "SECAM", },
>  };
>  
>  static enum drm_connector_status
> @@ -306,11 +378,16 @@ vc4_vec_connector_set_property(struct drm_connector
*connector,
>  		state->tv.mode = DRM_MODE_TV_MODE_NTSC;
>  		break;
>  
> +	case VC4_VEC_TV_MODE_NTSC_443:
> +		state->tv.mode = DRM_MODE_TV_MODE_NTSC_443;
> +		break;
> +
>  	case VC4_VEC_TV_MODE_NTSC_J:
>  		state->tv.mode = DRM_MODE_TV_MODE_NTSC_J;
>  		break;
>  
>  	case VC4_VEC_TV_MODE_PAL:
> +	case VC4_VEC_TV_MODE_PAL_60:
>  		state->tv.mode = DRM_MODE_TV_MODE_PAL;
>  		break;
>  
> @@ -318,6 +395,14 @@ vc4_vec_connector_set_property(struct drm_connector
*connector,
>  		state->tv.mode = DRM_MODE_TV_MODE_PAL_M;
>  		break;
>  
> +	case VC4_VEC_TV_MODE_PAL_N:
> +		state->tv.mode = DRM_MODE_TV_MODE_PAL_N;
> +		break;
> +
> +	case VC4_VEC_TV_MODE_SECAM:
> +		state->tv.mode = DRM_MODE_TV_MODE_SECAM;
> +		break;
> +
>  	default:
>  		return -EINVAL;
>  	}
> @@ -341,6 +426,10 @@ vc4_vec_connector_get_property(struct drm_connector
*connector,
>  		*val = VC4_VEC_TV_MODE_NTSC;
>  		break;
>  
> +	case DRM_MODE_TV_MODE_NTSC_443:
> +		*val = VC4_VEC_TV_MODE_NTSC_443;
> +		break;
> +
>  	case DRM_MODE_TV_MODE_NTSC_J:
>  		*val = VC4_VEC_TV_MODE_NTSC_J;
>  		break;
> @@ -353,6 +442,14 @@ vc4_vec_connector_get_property(struct drm_connector
*connector,
>  		*val = VC4_VEC_TV_MODE_PAL_M;
>  		break;
>  
> +	case DRM_MODE_TV_MODE_PAL_N:
> +		*val = VC4_VEC_TV_MODE_PAL_N;
> +		break;
> +
> +	case DRM_MODE_TV_MODE_SECAM:
> +		*val = VC4_VEC_TV_MODE_SECAM;
> +		break;
> +
>  	default:
>  		return -EINVAL;
>  	}
> @@ -448,13 +545,16 @@ static void vc4_vec_encoder_enable(struct drm_encoder
*encoder,
>  	struct drm_connector *connector = &vec->connector;
>  	struct drm_connector_state *conn_state >  	
drm_atomic_get_new_connector_state(state, connector);
> +	struct drm_display_mode *adjusted_mode > +	
&encoder->crtc->state->adjusted_mode;
>  	const struct vc4_vec_tv_mode *tv_mode;
>  	int idx, ret;
>  
>  	if (!drm_dev_enter(drm, &idx))
>  		return;
>  
> -	tv_mode = vc4_vec_tv_mode_lookup(conn_state->tv.mode);
> +	tv_mode = vc4_vec_tv_mode_lookup(conn_state->tv.mode,
> +					 adjusted_mode->htotal);
>  	if (!tv_mode)
>  		goto err_dev_exit;
>  
> @@ -648,9 +748,12 @@ static int vc4_vec_bind(struct device *dev, struct
device *master, void *data)
>  
>  	ret = drm_mode_create_tv_properties(drm,
>  					    BIT(DRM_MODE_TV_MODE_NTSC) |
> +					    BIT(DRM_MODE_TV_MODE_NTSC_443) |
>  					    BIT(DRM_MODE_TV_MODE_NTSC_J) |
>  					    BIT(DRM_MODE_TV_MODE_PAL) |
> -					    BIT(DRM_MODE_TV_MODE_PAL_M));
> +					    BIT(DRM_MODE_TV_MODE_PAL_M) |
> +					    BIT(DRM_MODE_TV_MODE_PAL_N) |
> +					    BIT(DRM_MODE_TV_MODE_SECAM));
>  	if (ret)
>  		return ret;
>  
>*/pre>

Lukas Satin

2022-Nov-09 16:55 UTC

head link

[Nouveau] [PATCH v7 22/23] drm/vc4: vec: Add support for more analog TV standards

That's great, I will test it on Ubuntu + Nouveau x86_64 and Batocera-Linux.

I'm not interested in Raspberry Pi. I see you have some commit in
RaspberryPi/Linux. Will this go to some Nouveau driver, so I can test it on
x86_64 machine? I have some basic experience compiling Linux kernel (nvidia
driver) from 10 years ago.

Scaling is not the way to go because I do this to not use scaling. I could
use 640x480 and scale 320x240 to that mode, right? That is what old
retrogaming laptop LCD screens do (you can even enable this in their BIOS).

More appropriate is to preserve pixel ratio and have some border. So you
mostly select the closest resolution and live with small border on the
edge. Then you can crop it on analog TV using real world dials :-)

I joined Nouveau developer list here. I don't know why we have like 40
email recipients here and now we discuss Raspberry. Anyway, I would like to
see this in Nouveau, so I could test it on several Geforce devices with TV
out and Windows Media Center devices such as Acer iDEA 510. Such devices
have SCART and component out, they did cost quite a lot and nowadays you
can get them for 30-50 EUR. It is cheaper that Raspberry with all the
additional cables and have better video output quality (RGB is better than
CVBS).

There was NVTV utility that can do this in Linux, but that works only for
Geforce 3 and older. That would make sense if you get Intel Core Quad
motherboard with AGP slot (yes they do exist).

So I'm collecting various retrogaming hardware, have 8 computers on single
KVM and CRT, several big box games and 20 computers total. Two Sony PVM's,
one JVC, several CRT's and Samsung QLED with HDR as well. I prefer CRT :-)

So can we have this NVTV functionality or this above Rasp commit in
Nouveau, so I can test it with Nvidia GPU even it takes me whole weekend to
mess around?

When it works, I would like to present it to regular retrogaming community
and give you a proper credit, of course.

Thank you,
Lukas

On Wed, Nov 9, 2022 at 2:15 AM Mateusz Kwiatkowski <kfyatek at gmail.com>
wrote:
> Hi Maxime,
>
> I ran your v7 patchset on my Pi with Xorg, and the mode switching, as well
> as
> the preferred mode handling, all work really well now!
>
> I just noted that the downstream version of the vc4 driver still has
> inaccurate
> field delays in vc4_crtc.c, which causes vertical lines to appear jagged
> (like
> here:
>
https://user-images.githubusercontent.com/4499762/112738569-385c3280-8f64-11eb-83c4-d671537af209.png
> ).
> This has been fixed downstream in
>
>
https://github.com/raspberrypi/linux/pull/4241/commits/bc093f27bf2613ec93524fdc19e922dd7dd3d800
> ,
> but I guess that should be upstreamed separately...?
>
> Anyway, it's unrelated to the changes made in this patchset, so...
I'm not
> sure
> if I'm qualified or allowed to do these, but just in case:
>
> Tested-by: Mateusz Kwiatkowski <kfyatek+publicgit at gmail.com>
>
> (that pretty much applies to parts 19-22 in general, I can respond to those
> messages as well if you wish)
>
> Best regards,
> Mateusz Kwiatkowski
>
> W dniu 7.11.2022 o 15:16, Maxime Ripard pisze:
> > From: Mateusz Kwiatkowski <kfyatek+publicgit at gmail.com>
> >
> > Add support for the following composite output modes (all of them are
> > somewhat more obscure than the previously defined ones):
> >
> > - NTSC_443 - NTSC-style signal with the chroma subcarrier shifted to
> >   4.43361875 MHz (the PAL subcarrier frequency). Never used for
> >   broadcasting, but sometimes used as a hack to play NTSC content in
PAL
> >   regions (e.g. on VCRs).
> > - PAL_N - PAL with alternative chroma subcarrier frequency,
> >   3.58205625 MHz. Used as a broadcast standard in Argentina, Paraguay
> >   and Uruguay to fit 576i50 with colour in 6 MHz channel raster.
> > - PAL60 - 480i60 signal with PAL-style color at normal European PAL
> >   frequency. Another non-standard, non-broadcast mode, used in similar
> >   contexts as NTSC_443. Some displays support one but not the other.
> > - SECAM - French frequency-modulated analog color standard; also have
> >   been broadcast in Eastern Europe and various parts of Africa and
Asia.
> >   Uses the same 576i50 timings as PAL.
> >
> > Also added some comments explaining color subcarrier frequency
> > registers.
> >
> > Acked-by: Noralf Tr?nnes <noralf at tronnes.org>
> > Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit at
gmail.com>
> > Signed-off-by: Maxime Ripard <maxime at cerno.tech>
> >
> > ---
> > Changes in v6:
> > - Support PAL60 again
> > ---
> >  drivers/gpu/drm/vc4/vc4_vec.c | 111
> ++++++++++++++++++++++++++++++++++++++++--
> >  1 file changed, 107 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/vc4/vc4_vec.c
> b/drivers/gpu/drm/vc4/vc4_vec.c
> > index a828fc6fb776..d23dbad3cbf6 100644
> > --- a/drivers/gpu/drm/vc4/vc4_vec.c
> > +++ b/drivers/gpu/drm/vc4/vc4_vec.c
> > @@ -46,6 +46,7 @@
> >  #define VEC_CONFIG0_YDEL(x)          ((x) << 26)
> >  #define VEC_CONFIG0_CDEL_MASK                GENMASK(25, 24)
> >  #define VEC_CONFIG0_CDEL(x)          ((x) << 24)
> > +#define VEC_CONFIG0_SECAM_STD                BIT(21)
> >  #define VEC_CONFIG0_PBPR_FIL         BIT(18)
> >  #define VEC_CONFIG0_CHROMA_GAIN_MASK GENMASK(17, 16)
> >  #define VEC_CONFIG0_CHROMA_GAIN_UNITY        (0 << 16)
> > @@ -76,6 +77,27 @@
> >  #define VEC_SOFT_RESET                       0x10c
> >  #define VEC_CLMP0_START                      0x144
> >  #define VEC_CLMP0_END                        0x148
> > +
> > +/*
> > + * These set the color subcarrier frequency
> > + * if VEC_CONFIG1_CUSTOM_FREQ is enabled.
> > + *
> > + * VEC_FREQ1_0 contains the most significant 16-bit half-word,
> > + * VEC_FREQ3_2 contains the least significant 16-bit half-word.
> > + * 0x80000000 seems to be equivalent to the pixel clock
> > + * (which itself is the VEC clock divided by 8).
> > + *
> > + * Reference values (with the default pixel clock of 13.5 MHz):
> > + *
> > + * NTSC  (3579545.[45] Hz)     - 0x21F07C1F
> > + * PAL   (4433618.75 Hz)       - 0x2A098ACB
> > + * PAL-M (3575611.[888111] Hz) - 0x21E6EFE3
> > + * PAL-N (3582056.25 Hz)       - 0x21F69446
> > + *
> > + * NOTE: For SECAM, it is used as the Dr center frequency,
> > + * regardless of whether VEC_CONFIG1_CUSTOM_FREQ is enabled or not;
> > + * that is specified as 4406250 Hz, which corresponds to 0x29C71C72.
> > + */
> >  #define VEC_FREQ3_2                  0x180
> >  #define VEC_FREQ1_0                  0x184
> >
> > @@ -118,6 +140,14 @@
> >
> >  #define VEC_INTERRUPT_CONTROL                0x190
> >  #define VEC_INTERRUPT_STATUS         0x194
> > +
> > +/*
> > + * Db center frequency for SECAM; the clock for this is the same as
for
> > + * VEC_FREQ3_2/VEC_FREQ1_0, which is used for Dr center frequency.
> > + *
> > + * This is specified as 4250000 Hz, which corresponds to 0x284BDA13.
> > + * That is also the default value, so no need to set it explicitly.
> > + */
> >  #define VEC_FCW_SECAM_B                      0x198
> >  #define VEC_SECAM_GAIN_VAL           0x19c
> >
> > @@ -197,10 +227,15 @@ enum vc4_vec_tv_mode_id {
> >       VC4_VEC_TV_MODE_NTSC_J,
> >       VC4_VEC_TV_MODE_PAL,
> >       VC4_VEC_TV_MODE_PAL_M,
> > +     VC4_VEC_TV_MODE_NTSC_443,
> > +     VC4_VEC_TV_MODE_PAL_60,
> > +     VC4_VEC_TV_MODE_PAL_N,
> > +     VC4_VEC_TV_MODE_SECAM,
> >  };
> >
> >  struct vc4_vec_tv_mode {
> >       unsigned int mode;
> > +     u16 expected_htotal;
> >       u32 config0;
> >       u32 config1;
> >       u32 custom_freq;
> > @@ -236,35 +271,68 @@ static const struct debugfs_reg32 vec_regs[] = {
> >  static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = {
> >       {
> >               .mode = DRM_MODE_TV_MODE_NTSC,
> > +             .expected_htotal = 858,
> >               .config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN,
> >               .config1 = VEC_CONFIG1_C_CVBS_CVBS,
> >       },
> > +     {
> > +             .mode = DRM_MODE_TV_MODE_NTSC_443,
> > +             .expected_htotal = 858,
> > +             .config0 = VEC_CONFIG0_NTSC_STD,
> > +             .config1 = VEC_CONFIG1_C_CVBS_CVBS |
> VEC_CONFIG1_CUSTOM_FREQ,
> > +             .custom_freq = 0x2a098acb,
> > +     },
> >       {
> >               .mode = DRM_MODE_TV_MODE_NTSC_J,
> > +             .expected_htotal = 858,
> >               .config0 = VEC_CONFIG0_NTSC_STD,
> >               .config1 = VEC_CONFIG1_C_CVBS_CVBS,
> >       },
> >       {
> >               .mode = DRM_MODE_TV_MODE_PAL,
> > +             .expected_htotal = 864,
> >               .config0 = VEC_CONFIG0_PAL_BDGHI_STD,
> >               .config1 = VEC_CONFIG1_C_CVBS_CVBS,
> >       },
> > +     {
> > +             /* PAL-60 */
> > +             .mode = DRM_MODE_TV_MODE_PAL,
> > +             .expected_htotal = 858,
> > +             .config0 = VEC_CONFIG0_PAL_M_STD,
> > +             .config1 = VEC_CONFIG1_C_CVBS_CVBS |
> VEC_CONFIG1_CUSTOM_FREQ,
> > +             .custom_freq = 0x2a098acb,
> > +     },
> >       {
> >               .mode = DRM_MODE_TV_MODE_PAL_M,
> > +             .expected_htotal = 858,
> >               .config0 = VEC_CONFIG0_PAL_M_STD,
> >               .config1 = VEC_CONFIG1_C_CVBS_CVBS,
> >       },
> > +     {
> > +             .mode = DRM_MODE_TV_MODE_PAL_N,
> > +             .expected_htotal = 864,
> > +             .config0 = VEC_CONFIG0_PAL_N_STD,
> > +             .config1 = VEC_CONFIG1_C_CVBS_CVBS,
> > +     },
> > +     {
> > +             .mode = DRM_MODE_TV_MODE_SECAM,
> > +             .expected_htotal = 864,
> > +             .config0 = VEC_CONFIG0_SECAM_STD,
> > +             .config1 = VEC_CONFIG1_C_CVBS_CVBS,
> > +             .custom_freq = 0x29c71c72,
> > +     },
> >  };
> >
> >  static inline const struct vc4_vec_tv_mode *
> > -vc4_vec_tv_mode_lookup(unsigned int mode)
> > +vc4_vec_tv_mode_lookup(unsigned int mode, u16 htotal)
> >  {
> >       unsigned int i;
> >
> >       for (i = 0; i < ARRAY_SIZE(vc4_vec_tv_modes); i++) {
> >               const struct vc4_vec_tv_mode *tv_mode >
&vc4_vec_tv_modes[i];
> >
> > -             if (tv_mode->mode == mode)
> > +             if (tv_mode->mode == mode &&
> > +                 tv_mode->expected_htotal == htotal)
> >                       return tv_mode;
> >       }
> >
> > @@ -273,9 +341,13 @@ vc4_vec_tv_mode_lookup(unsigned int mode)
> >
> >  static const struct drm_prop_enum_list legacy_tv_mode_names[] = {
> >       { VC4_VEC_TV_MODE_NTSC, "NTSC", },
> > +     { VC4_VEC_TV_MODE_NTSC_443, "NTSC-443", },
> >       { VC4_VEC_TV_MODE_NTSC_J, "NTSC-J", },
> >       { VC4_VEC_TV_MODE_PAL, "PAL", },
> > +     { VC4_VEC_TV_MODE_PAL_60, "PAL-60", },
> >       { VC4_VEC_TV_MODE_PAL_M, "PAL-M", },
> > +     { VC4_VEC_TV_MODE_PAL_N, "PAL-N", },
> > +     { VC4_VEC_TV_MODE_SECAM, "SECAM", },
> >  };
> >
> >  static enum drm_connector_status
> > @@ -306,11 +378,16 @@ vc4_vec_connector_set_property(struct
> drm_connector *connector,
> >               state->tv.mode = DRM_MODE_TV_MODE_NTSC;
> >               break;
> >
> > +     case VC4_VEC_TV_MODE_NTSC_443:
> > +             state->tv.mode = DRM_MODE_TV_MODE_NTSC_443;
> > +             break;
> > +
> >       case VC4_VEC_TV_MODE_NTSC_J:
> >               state->tv.mode = DRM_MODE_TV_MODE_NTSC_J;
> >               break;
> >
> >       case VC4_VEC_TV_MODE_PAL:
> > +     case VC4_VEC_TV_MODE_PAL_60:
> >               state->tv.mode = DRM_MODE_TV_MODE_PAL;
> >               break;
> >
> > @@ -318,6 +395,14 @@ vc4_vec_connector_set_property(struct
drm_connector
> *connector,
> >               state->tv.mode = DRM_MODE_TV_MODE_PAL_M;
> >               break;
> >
> > +     case VC4_VEC_TV_MODE_PAL_N:
> > +             state->tv.mode = DRM_MODE_TV_MODE_PAL_N;
> > +             break;
> > +
> > +     case VC4_VEC_TV_MODE_SECAM:
> > +             state->tv.mode = DRM_MODE_TV_MODE_SECAM;
> > +             break;
> > +
> >       default:
> >               return -EINVAL;
> >       }
> > @@ -341,6 +426,10 @@ vc4_vec_connector_get_property(struct
drm_connector
> *connector,
> >               *val = VC4_VEC_TV_MODE_NTSC;
> >               break;
> >
> > +     case DRM_MODE_TV_MODE_NTSC_443:
> > +             *val = VC4_VEC_TV_MODE_NTSC_443;
> > +             break;
> > +
> >       case DRM_MODE_TV_MODE_NTSC_J:
> >               *val = VC4_VEC_TV_MODE_NTSC_J;
> >               break;
> > @@ -353,6 +442,14 @@ vc4_vec_connector_get_property(struct
drm_connector
> *connector,
> >               *val = VC4_VEC_TV_MODE_PAL_M;
> >               break;
> >
> > +     case DRM_MODE_TV_MODE_PAL_N:
> > +             *val = VC4_VEC_TV_MODE_PAL_N;
> > +             break;
> > +
> > +     case DRM_MODE_TV_MODE_SECAM:
> > +             *val = VC4_VEC_TV_MODE_SECAM;
> > +             break;
> > +
> >       default:
> >               return -EINVAL;
> >       }
> > @@ -448,13 +545,16 @@ static void vc4_vec_encoder_enable(struct
> drm_encoder *encoder,
> >       struct drm_connector *connector = &vec->connector;
> >       struct drm_connector_state *conn_state > >              
drm_atomic_get_new_connector_state(state, connector);
> > +     struct drm_display_mode *adjusted_mode > > +            
&encoder->crtc->state->adjusted_mode;
> >       const struct vc4_vec_tv_mode *tv_mode;
> >       int idx, ret;
> >
> >       if (!drm_dev_enter(drm, &idx))
> >               return;
> >
> > -     tv_mode = vc4_vec_tv_mode_lookup(conn_state->tv.mode);
> > +     tv_mode = vc4_vec_tv_mode_lookup(conn_state->tv.mode,
> > +                                      adjusted_mode->htotal);
> >       if (!tv_mode)
> >               goto err_dev_exit;
> >
> > @@ -648,9 +748,12 @@ static int vc4_vec_bind(struct device *dev,
struct
> device *master, void *data)
> >
> >       ret = drm_mode_create_tv_properties(drm,
> >                                           BIT(DRM_MODE_TV_MODE_NTSC) |
> > +                                        
BIT(DRM_MODE_TV_MODE_NTSC_443)
> |
> >                                           BIT(DRM_MODE_TV_MODE_NTSC_J)
|
> >                                           BIT(DRM_MODE_TV_MODE_PAL) |
> > -                                        
BIT(DRM_MODE_TV_MODE_PAL_M));
> > +                                         BIT(DRM_MODE_TV_MODE_PAL_M)
|
> > +                                         BIT(DRM_MODE_TV_MODE_PAL_N)
|
> > +                                        
BIT(DRM_MODE_TV_MODE_SECAM));
> >       if (ret)
> >               return ret;
> >
> >
> */pre>
>
>-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<https://lists.freedesktop.org/archives/nouveau/attachments/20221109/aea756f4/attachment-0001.htm>

Maxime Ripard

2022-Nov-10 10:57 UTC

head link

[Nouveau] [PATCH v7 22/23] drm/vc4: vec: Add support for more analog TV standards

Hi!

On Wed, Nov 09, 2022 at 02:15:29AM +0100, Mateusz Kwiatkowski
wrote:> I ran your v7 patchset on my Pi with Xorg, and the mode switching, as well
as
> the preferred mode handling, all work really well now!
Thanks again for all your help
> I just noted that the downstream version of the vc4 driver still has
inaccurate
> field delays in vc4_crtc.c, which causes vertical lines to appear jagged
(like
> here:
https://user-images.githubusercontent.com/4499762/112738569-385c3280-8f64-11eb-83c4-d671537af209.png).
> This has been fixed downstream in
>
https://github.com/raspberrypi/linux/pull/4241/commits/bc093f27bf2613ec93524fdc19e922dd7dd3d800,
> but I guess that should be upstreamed separately...?
I guess I missed it while rebasing, but yeah, it should definitely be
upstreamed.

Maxime

Nouveau - Nov 2022 - [PATCH v7 22/23] drm/vc4: vec: Add support for more analog TV standards

[Nouveau] [PATCH v7 22/23] drm/vc4: vec: Add support for more analog TV standards

[Nouveau] [PATCH v7 22/23] drm/vc4: vec: Add support for more analog TV standards

[Nouveau] [PATCH v7 22/23] drm/vc4: vec: Add support for more analog TV standards