Re: [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 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 > > (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 > > > > 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 > > Signed-off-by: Mateusz Kwiatkowski > > Signed-off-by: Maxime Ripard > > > > --- > > 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_MASKGENMASK(25, 24) > > #define VEC_CONFIG0_CDEL(x) ((x) << 24) > > +#define VEC_CONFIG0_SECAM_STDBIT(21) > > #define
Re: [Nouveau] [PATCH v7 06/23] drm/modes: Add a function to generate analog display modes
Hi, your statement:
"However, analog display usually have fairly loose timings requirements,
the only discrete parameters being the total number of lines and pixel
clock frequency."
Please do not make it as a rule. You said yourself: "usually". Arcade CRT
have more loose timings, but professional broadcast TV's such as Sony PVM,
Sony BVM, JVC. These cost tens of thousand dollars back in the day. Now
they are affordable for gamers. I just solved issue in Retroarch, CRT
Switchres library here: https://github.com/antonioginer/switchres/issues/96
This model is quite common among retrogamers and on Reddit.
Some developers do not test it properly.
This model requires exact number of lines.
For Switchres we came up with these ranges:
crt_range0 15625-15750, 49.50-65.00, 2.000, 4.700, 8.000,
0.064, 0.192, 1.024, 1, 1, 192, 288, 0, 0
crt_range1 15625.00-15625.00, 50.00-50.00, 1.500, 4.700,
5.800, 0.064, 0.160, 1.056, 1, 1, 0, 0, 448, 576
crt_range2 15734.26-15734.26, 59.94-59.94, 1.500, 4.700,
4.700, 0.191, 0.191, 0.953, 1, 1, 0, 0, 448, 480
crt_range0 is default, more loose definition for MAME emulators. crt_range1
is PAL and crt_range2 is NTSC.
Yes, this model does support both NTSC and PAL.
Does your driver or library support that?
For example old driver in Windows 7 with NVIDIA 2007 driver on Geforce 7600
can support both NTSC and PAL and these are being switched automatically by
the resolution you choose. So in desktop properties, you change to 640x480
and it will switch TV chipset to NTSC 480i. Then you change to 720x576 and
it will switch TV chipset to PAL 576i.
It would be preferred if advanced users could set up these numbers from a
commandline during a runtime, so it would depend on the app being used.
Lukas
On Mon, Nov 7, 2022 at 3:17 PM Maxime Ripard wrote:
> Multiple drivers (meson, vc4, sun4i) define analog TV 525-lines and
> 625-lines modes in their drivers.
>
> Since those modes are fairly standard, and that we'll need to use them
> in more places in the future, it makes sense to move their definition
> into the core framework.
>
> However, analog display usually have fairly loose timings requirements,
> the only discrete parameters being the total number of lines and pixel
> clock frequency. Thus, we created a function that will create a display
> mode from the standard, the pixel frequency and the active area.
>
> Signed-off-by: Maxime Ripard
>
> ---
> Changes in v6:
> - Fix typo
>
> Changes in v4:
> - Reworded the line length check comment
> - Switch to HZ_PER_KHZ in tests
> - Use previous timing to fill our mode
> - Move the number of lines check earlier
> ---
> drivers/gpu/drm/drm_modes.c| 474
> +
> drivers/gpu/drm/tests/Makefile | 1 +
> drivers/gpu/drm/tests/drm_modes_test.c | 144 ++
> include/drm/drm_modes.h| 17 ++
> 4 files changed, 636 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
> index 5d4ac79381c4..71c050c3ee6b 100644
> --- a/drivers/gpu/drm/drm_modes.c
> +++ b/drivers/gpu/drm/drm_modes.c
> @@ -116,6 +116,480 @@ void drm_mode_probed_add(struct drm_connector
> *connector,
> }
> EXPORT_SYMBOL(drm_mode_probed_add);
>
> +enum drm_mode_analog {
> + DRM_MODE_ANALOG_NTSC, /* 525 lines, 60Hz */
> + DRM_MODE_ANALOG_PAL, /* 625 lines, 50Hz */
> +};
> +
> +/*
> + * The timings come from:
> + * -
> https://web.archive.org/web/20220406232708/http://www.kolumbus.fi/pami1/video/pal_ntsc.html
> + * -
> https://web.archive.org/web/20220406124914/http://martin.hinner.info/vga/pal.html
> + * -
> https://web.archive.org/web/20220609202433/http://www.batsocks.co.uk/readme/video_timing.htm
> + */
> +#define NTSC_LINE_DURATION_NS 63556U
> +#define NTSC_LINES_NUMBER 525
> +
> +#define NTSC_HBLK_DURATION_TYP_NS 10900U
> +#define NTSC_HBLK_DURATION_MIN_NS (NTSC_HBLK_DURATION_TYP_NS - 200)
> +#define NTSC_HBLK_DURATION_MAX_NS (NTSC_HBLK_DURATION_TYP_NS + 200)
> +
> +#define NTSC_HACT_DURATION_TYP_NS (NTSC_LINE_DURATION_NS -
> NTSC_HBLK_DURATION_TYP_NS)
> +#define NTSC_HACT_DURATION_MIN_NS (NTSC_LINE_DURATION_NS -
> NTSC_HBLK_DURATION_MAX_NS)
> +#define NTSC_HACT_DURATION_MAX_NS (NTSC_LINE_DURATION_NS -
> NTSC_HBLK_DURATION_MIN_NS)
> +
> +#define NTSC_HFP_DURATION_TYP_NS 1500
> +#define NTSC_HFP_DURATION_MIN_NS 1270
> +#define NTSC_HFP_DURATION_MAX_NS 2220
> +
> +#define NTSC_HSLEN_DURATION_TYP_NS 4700
> +#define NTSC_HSLEN_DURATION_MIN_NS (NTSC_HSLEN_DURATION_TYP_NS - 100)
> +#define NTSC_HSLEN_DURATION_MAX_NS (NTSC_HSLEN_DURATION_TYP_NS + 100)
> +
> +#define NTSC_HBP_DURATION_TYP_NS 4700
> +
> +/*
> + * I couldn't find the actual tolerance for the back porch, so let's
> + * just reuse the sync length ones.
> + */
> +#define NTSC_HBP_DURATION_MIN_NS (NTSC_HBP_DURATION_TYP_NS - 100)
> +#define NTSC_HBP_DURATION_MAX_NS
Re: [Nouveau] [PATCH v7 22/23] drm/vc4: vec: Add support for more analog TV standards
They are important for retrogaming and connecting TV out to CRT TV or using
emulator.
I have PS1 that is using PAL-60 for example.
Can you add 240p and 288p non-interlaced modes for NTSC and PAL, please?
Lukas
On Mon, Nov 7, 2022 at 3:19 PM Maxime Ripard wrote:
> From: Mateusz Kwiatkowski
>
> 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
> Signed-off-by: Mateusz Kwiatkowski
> Signed-off-by: Maxime Ripard
>
> ---
> 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_START0x144
> #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.
> + * 0x8000 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_20x180
> #define VEC_FREQ1_00x184
>
> @@ -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 425 Hz, which corresponds to 0x284BDA13.
> + * That is also the default value, so no need to set it explicitly.
> + */
> #define VEC_FCW_SECAM_B0x198
> #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,
Re: [Nouveau] [PATCH v7 00/23] drm: Analog TV Improvements
One can switch from NTSC to PAL now using (on vc4) modetest -M vc4 -s 53:720x480i -w 53:'TV mode':1 # NTSC modetest -M vc4 -s 53:720x576i -w 53:'TV mode':4 # PAL NTSC should be 640x480i, not 720. It will probably work on most TV's, but NTSC by the spec is 640x480i. On Mon, Nov 7, 2022 at 3:16 PM Maxime Ripard wrote: > Hi, > > Here's a series aiming at improving the command line named modes support, > and more importantly how we deal with all the analog TV variants. > > The named modes support were initially introduced to allow to specify the > analog TV mode to be used. > > However, this was causing multiple issues: > > * The mode name parsed on the command line was passed directly to the > driver, which had to figure out which mode it was suppose to match; > > * Figuring that out wasn't really easy, since the video= argument or what > the userspace might not even have a name in the first place, but > instead could have passed a mode with the same timings; > > * The fallback to matching on the timings was mostly working as long as > we were supporting one 525 lines (most likely NSTC) and one 625 lines > (PAL), but couldn't differentiate between two modes with the same > timings (NTSC vs PAL-M vs NSTC-J for example); > > * There was also some overlap with the tv mode property registered by > drm_mode_create_tv_properties(), but named modes weren't interacting > with that property at all. > > * Even though that property was generic, its possible values were > specific to each drivers, which made some generic support difficult. > > Thus, I chose to tackle in multiple steps: > > * A new TV mode property was introduced, with generic values, each driver > reporting through a bitmask what standard it supports to the userspace; > > * This option was added to the command line parsing code to be able to > specify it on the kernel command line, and new atomic_check and reset > helpers were created to integrate properly into atomic KMS; > > * The named mode parsing code is now creating a proper display mode for > the given named mode, and the TV standard will thus be part of the > connector state; > > * Two drivers were converted and tested for now (vc4 and sun4i), with > some backward compatibility code to translate the old TV mode to the > new TV mode; > > Unit tests were created along the way. > > One can switch from NTSC to PAL now using (on vc4) > > modetest -M vc4 -s 53:720x480i -w 53:'TV mode':1 # NTSC > modetest -M vc4 -s 53:720x576i -w 53:'TV mode':4 # PAL > > Let me know what you think, > Maxime > > To: David Airlie > To: Daniel Vetter > To: Maarten Lankhorst > To: Maxime Ripard > To: Thomas Zimmermann > To: Emma Anholt > To: Jani Nikula > To: Joonas Lahtinen > To: Rodrigo Vivi > To: Tvrtko Ursulin > To: Ben Skeggs > To: Karol Herbst > To: Lyude Paul > To: Chen-Yu Tsai > To: Jernej Skrabec > To: Samuel Holland > Cc: Geert Uytterhoeven > Cc: Mateusz Kwiatkowski > Cc: "Noralf Trønnes" > Cc: Dave Stevenson > Cc: Dom Cobley > Cc: Phil Elwell > Cc: > Cc: linux-ker...@vger.kernel.org > Cc: intel-...@lists.freedesktop.org > Cc: nouv...@lists.freedesktop.org > Cc: linux-arm-ker...@lists.infradead.org > Cc: linux-su...@lists.linux.dev > Cc: Hans de Goede > Signed-off-by: Maxime Ripard > > --- > Changes in v7: > - Switch to another implementation of get_modes from Noralf > - Made more checks in VEC's atomic_check > - Fixed typo in a commit log > - Checked for tv_mode_specified in > drm_mode_parse_command_line_for_connector > - Rebased on drm-misc-next-2022-11-03 > - Link to v6: > https://lore.kernel.org/r/20220728-rpi-analog-tv-properties-v6-0-e77927341...@cerno.tech > > Changes in v6: > - Add and convert to a new get_modes helper to create the PAL and NTSC > modes in > the proper order, with the right preferred mode flag, depending on the > driver > capabilities and defaults. > - Support PAL60 > - Renamed tests to be consistent with DRM tests naming convention > - Simplified a bit the named mode parsing code > - Add a tv_mode_specified field > - Return 0 in get_modes implementations instead of error codes > - Link to v5: > https://lore.kernel.org/r/20220728-rpi-analog-tv-properties-v5-0-d841cc64f...@cerno.tech > > Changes in v5: > - Dropped TV Standard documentation removal > - Switched the TV Mode documentation from CSV to actual documentation > - Switched to kunit assertions where possible > - Switched to KUNIT_ASSERT_NOT_NULL instead of KUNIT_ASSERT_PTR_NE(..., > NULL) > - Shuffled a bit the introduction of > drm_client_modeset_connector_get_modes between patches > - Renamed tv_mode_names to legacy_tv_mode_names > - Removed the count variable in sun4i_tv_comp_get_modes > - Rebased on top of current drm-misc-next > - Link to v4: > https://lore.kernel.org/r/20220728-rpi-analog-tv-properties-v4-0-60d38873f...@cerno.tech > > Changes in v4: > - Removed the unused TV Standard property documentation >
