| Message ID | 20220728-rpi-analog-tv-properties-v1-24-3d53ae722097@cerno.tech (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Neil Armstrong |
| Headers | show |
| Series | drm: Analog TV Improvements | expand |
Hi Maxime, I think that declaring PAL-B and SECAM-B as the only supported 576i norms is a bit random. Norms B, D, G, H, I, K, K1 and L (for both PAL and SECAM) are essentially identical if we're talking about baseband signals, AFAIK they only differ when those are modulated as RF signals. I'm not sure if there's a point to differentiating those (that's more about patch 05/35) unless we need to deal with some device that actually features an RF modulator. But if we do want to have all those norms separate, then I'd say that VC4 should declare support for all of those, and all should map to the same VEC settings. Some users from e.g. the UK might think that they won't get proper picture if PAL-I is not on the list of supported norms. Same goes for e.g. SECAM-D/K in the former Soviet territories, and so on. Best regards, Mateusz Kwiatkowski W dniu 29.07.2022 o 18:35, Maxime Ripard pisze: > From: Mateusz Kwiatkowski <kfyatek+publicgit@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. > > Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com> > Signed-off-by: Maxime Ripard <maxime@cerno.tech> > > diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c > index e40b55de1b3c..91d343238b0f 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 > > @@ -194,9 +224,13 @@ connector_to_vc4_vec(struct drm_connector *connector) > > enum vc4_vec_tv_mode_id { > VC4_VEC_TV_MODE_NTSC, > + VC4_VEC_TV_MODE_NTSC_443, > VC4_VEC_TV_MODE_NTSC_J, > VC4_VEC_TV_MODE_PAL, > + VC4_VEC_TV_MODE_PAL_60, > VC4_VEC_TV_MODE_PAL_M, > + VC4_VEC_TV_MODE_PAL_N, > + VC4_VEC_TV_MODE_SECAM, > }; > > struct vc4_vec_tv_mode { > @@ -234,6 +268,12 @@ static const struct debugfs_reg32 vec_regs[] = { > }; > > static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = { > + { > + .mode = DRM_MODE_TV_NORM_NTSC_443, > + .config0 = VEC_CONFIG0_NTSC_STD, > + .config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ, > + .custom_freq = 0x2a098acb, > + }, > { > .mode = DRM_MODE_TV_NORM_NTSC_M, > .config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN, > @@ -244,6 +284,12 @@ static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = { > .config0 = VEC_CONFIG0_NTSC_STD, > .config1 = VEC_CONFIG1_C_CVBS_CVBS, > }, > + { > + .mode = DRM_MODE_TV_NORM_PAL_60, > + .config0 = VEC_CONFIG0_PAL_M_STD, > + .config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ, > + .custom_freq = 0x2a098acb, > + }, > { > .mode = DRM_MODE_TV_NORM_PAL_B, > .config0 = VEC_CONFIG0_PAL_BDGHI_STD, > @@ -254,6 +300,17 @@ static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = { > .config0 = VEC_CONFIG0_PAL_M_STD, > .config1 = VEC_CONFIG1_C_CVBS_CVBS, > }, > + { > + .mode = DRM_MODE_TV_NORM_PAL_N, > + .config0 = VEC_CONFIG0_PAL_N_STD, > + .config1 = VEC_CONFIG1_C_CVBS_CVBS, > + }, > + { > + .mode = DRM_MODE_TV_NORM_SECAM_B, > + .config0 = VEC_CONFIG0_SECAM_STD, > + .config1 = VEC_CONFIG1_C_CVBS_CVBS, > + .custom_freq = 0x29c71c72, > + }, > }; > > static inline const struct vc4_vec_tv_mode * > @@ -273,9 +330,13 @@ vc4_vec_tv_mode_lookup(unsigned int mode) > > static const struct drm_prop_enum_list 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 > @@ -329,6 +390,10 @@ vc4_vec_connector_set_property(struct drm_connector *connector, > state->tv.norm = DRM_MODE_TV_NORM_NTSC_M; > break; > > + case VC4_VEC_TV_MODE_NTSC_443: > + state->tv.norm = DRM_MODE_TV_NORM_NTSC_443; > + break; > + > case VC4_VEC_TV_MODE_NTSC_J: > state->tv.norm = DRM_MODE_TV_NORM_NTSC_J; > break; > @@ -337,10 +402,22 @@ vc4_vec_connector_set_property(struct drm_connector *connector, > state->tv.norm = DRM_MODE_TV_NORM_PAL_B; > break; > > + case VC4_VEC_TV_MODE_PAL_60: > + state->tv.norm = DRM_MODE_TV_NORM_PAL_60; > + break; > + > case VC4_VEC_TV_MODE_PAL_M: > state->tv.norm = DRM_MODE_TV_NORM_PAL_M; > break; > > + case VC4_VEC_TV_MODE_PAL_N: > + state->tv.norm = DRM_MODE_TV_NORM_PAL_N; > + break; > + > + case VC4_VEC_TV_MODE_SECAM: > + state->tv.norm = DRM_MODE_TV_NORM_SECAM_B; > + break; > + > default: > return -EINVAL; > } > @@ -360,6 +437,10 @@ vc4_vec_connector_get_property(struct drm_connector *connector, > return -EINVAL; > > switch (state->tv.norm) { > + case DRM_MODE_TV_NORM_NTSC_443: > + *val = VC4_VEC_TV_MODE_NTSC_443; > + break; > + > case DRM_MODE_TV_NORM_NTSC_J: > *val = VC4_VEC_TV_MODE_NTSC_J; > break; > @@ -368,6 +449,10 @@ vc4_vec_connector_get_property(struct drm_connector *connector, > *val = VC4_VEC_TV_MODE_NTSC; > break; > > + case DRM_MODE_TV_NORM_PAL_60: > + *val = VC4_VEC_TV_MODE_PAL_60; > + break; > + > case DRM_MODE_TV_NORM_PAL_B: > *val = VC4_VEC_TV_MODE_PAL; > break; > @@ -376,6 +461,14 @@ vc4_vec_connector_get_property(struct drm_connector *connector, > *val = VC4_VEC_TV_MODE_PAL_M; > break; > > + case DRM_MODE_TV_NORM_PAL_N: > + *val = VC4_VEC_TV_MODE_PAL_N; > + break; > + > + case DRM_MODE_TV_NORM_SECAM_B: > + *val = VC4_VEC_TV_MODE_SECAM; > + break; > + > default: > return -EINVAL; > } > @@ -605,10 +698,13 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data) > int ret; > > ret = drm_mode_create_tv_properties(drm, > + DRM_MODE_TV_NORM_NTSC_443 | > DRM_MODE_TV_NORM_NTSC_J | > DRM_MODE_TV_NORM_NTSC_M | > DRM_MODE_TV_NORM_PAL_B | > - DRM_MODE_TV_NORM_PAL_M, > + DRM_MODE_TV_NORM_PAL_M | > + DRM_MODE_TV_NORM_PAL_N | > + DRM_MODE_TV_NORM_SECAM_B, > 0, NULL); > if (ret) > return ret; >
Hi, On Fri, Jul 29, 2022 at 07:55:30PM +0200, Mateusz Kwiatkowski wrote: > Hi Maxime, > > I think that declaring PAL-B and SECAM-B as the only supported 576i > norms is a bit random. Starting with this patch, PAL-N should be supported as well, right? > Norms B, D, G, H, I, K, K1 and L (for both PAL and SECAM) are > essentially identical if we're talking about baseband signals, AFAIK > they only differ when those are modulated as RF signals. I'm not sure > if there's a point to differentiating those (that's more about patch > 05/35) unless we need to deal with some device that actually features > an RF modulator. What I was aiming for is to have all the cases we have in all the drivers covered so that we can make that property generic. i915 declares and uses all those variants: https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/i915/display/intel_sdvo.c#L68 Especially since it's i915 and it's pretty much the standard as far as the uAPI goes, I'd rather avoid any regression there. > But if we do want to have all those norms separate, then I'd say that > VC4 should declare support for all of those, and all should map to the > same VEC settings. Some users from e.g. the UK might think that they > won't get proper picture if PAL-I is not on the list of supported > norms. Same goes for e.g. SECAM-D/K in the former Soviet territories, > and so on. I'd be open to it, but we can always extend vc4 to support those modes later on. The work you did to make that easier should make it trivial. Maxime
Hi Maxime, W dniu 15.08.2022 o 10:37, Maxime Ripard pisze: > Hi, > > On Fri, Jul 29, 2022 at 07:55:30PM +0200, Mateusz Kwiatkowski wrote: >> Hi Maxime, >> >> I think that declaring PAL-B and SECAM-B as the only supported 576i >> norms is a bit random. > > Starting with this patch, PAL-N should be supported as well, right? Oh, sure. I forgot about it. My brain was too focused on the "standard PAL" modes, which excludes PAL-N. > >> Norms B, D, G, H, I, K, K1 and L (for both PAL and SECAM) are >> essentially identical if we're talking about baseband signals, AFAIK >> they only differ when those are modulated as RF signals. I'm not sure >> if there's a point to differentiating those (that's more about patch >> 05/35) unless we need to deal with some device that actually features >> an RF modulator. > > What I was aiming for is to have all the cases we have in all the > drivers covered so that we can make that property generic. i915 > declares and uses all those variants: > > https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/i915/display/intel_sdvo.c#L68 > > Especially since it's i915 and it's pretty much the standard as far as > the uAPI goes, I'd rather avoid any regression there. OK, if there are already drivers that differentiate those, then it doesn't make sense to introduce regressions. And yes, there is plenty of software already out there that differentiate between those modes in the context of composite video. It still doesn't make much sense from the engineering point of view, though. > >> But if we do want to have all those norms separate, then I'd say that >> VC4 should declare support for all of those, and all should map to the >> same VEC settings. Some users from e.g. the UK might think that they >> won't get proper picture if PAL-I is not on the list of supported >> norms. Same goes for e.g. SECAM-D/K in the former Soviet territories, >> and so on. > > I'd be open to it, but we can always extend vc4 to support those modes > later on. The work you did to make that easier should make it trivial. Doing that in the future is OK as well. I just wanted to point out that PAL-B/D/G/H/I/K/K1/L (and same for SECAM) is the same exact thing as far as baseband composite video is concerned, so declaring only one of those as supported is potentially misleading for anybody who is not aware of that fact. > > Maxime Best regards, Mateusz Kwiatkowski
diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index e40b55de1b3c..91d343238b0f 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 @@ -194,9 +224,13 @@ connector_to_vc4_vec(struct drm_connector *connector) enum vc4_vec_tv_mode_id { VC4_VEC_TV_MODE_NTSC, + VC4_VEC_TV_MODE_NTSC_443, VC4_VEC_TV_MODE_NTSC_J, VC4_VEC_TV_MODE_PAL, + VC4_VEC_TV_MODE_PAL_60, VC4_VEC_TV_MODE_PAL_M, + VC4_VEC_TV_MODE_PAL_N, + VC4_VEC_TV_MODE_SECAM, }; struct vc4_vec_tv_mode { @@ -234,6 +268,12 @@ static const struct debugfs_reg32 vec_regs[] = { }; static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = { + { + .mode = DRM_MODE_TV_NORM_NTSC_443, + .config0 = VEC_CONFIG0_NTSC_STD, + .config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ, + .custom_freq = 0x2a098acb, + }, { .mode = DRM_MODE_TV_NORM_NTSC_M, .config0 = VEC_CONFIG0_NTSC_STD | VEC_CONFIG0_PDEN, @@ -244,6 +284,12 @@ static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = { .config0 = VEC_CONFIG0_NTSC_STD, .config1 = VEC_CONFIG1_C_CVBS_CVBS, }, + { + .mode = DRM_MODE_TV_NORM_PAL_60, + .config0 = VEC_CONFIG0_PAL_M_STD, + .config1 = VEC_CONFIG1_C_CVBS_CVBS | VEC_CONFIG1_CUSTOM_FREQ, + .custom_freq = 0x2a098acb, + }, { .mode = DRM_MODE_TV_NORM_PAL_B, .config0 = VEC_CONFIG0_PAL_BDGHI_STD, @@ -254,6 +300,17 @@ static const struct vc4_vec_tv_mode vc4_vec_tv_modes[] = { .config0 = VEC_CONFIG0_PAL_M_STD, .config1 = VEC_CONFIG1_C_CVBS_CVBS, }, + { + .mode = DRM_MODE_TV_NORM_PAL_N, + .config0 = VEC_CONFIG0_PAL_N_STD, + .config1 = VEC_CONFIG1_C_CVBS_CVBS, + }, + { + .mode = DRM_MODE_TV_NORM_SECAM_B, + .config0 = VEC_CONFIG0_SECAM_STD, + .config1 = VEC_CONFIG1_C_CVBS_CVBS, + .custom_freq = 0x29c71c72, + }, }; static inline const struct vc4_vec_tv_mode * @@ -273,9 +330,13 @@ vc4_vec_tv_mode_lookup(unsigned int mode) static const struct drm_prop_enum_list 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 @@ -329,6 +390,10 @@ vc4_vec_connector_set_property(struct drm_connector *connector, state->tv.norm = DRM_MODE_TV_NORM_NTSC_M; break; + case VC4_VEC_TV_MODE_NTSC_443: + state->tv.norm = DRM_MODE_TV_NORM_NTSC_443; + break; + case VC4_VEC_TV_MODE_NTSC_J: state->tv.norm = DRM_MODE_TV_NORM_NTSC_J; break; @@ -337,10 +402,22 @@ vc4_vec_connector_set_property(struct drm_connector *connector, state->tv.norm = DRM_MODE_TV_NORM_PAL_B; break; + case VC4_VEC_TV_MODE_PAL_60: + state->tv.norm = DRM_MODE_TV_NORM_PAL_60; + break; + case VC4_VEC_TV_MODE_PAL_M: state->tv.norm = DRM_MODE_TV_NORM_PAL_M; break; + case VC4_VEC_TV_MODE_PAL_N: + state->tv.norm = DRM_MODE_TV_NORM_PAL_N; + break; + + case VC4_VEC_TV_MODE_SECAM: + state->tv.norm = DRM_MODE_TV_NORM_SECAM_B; + break; + default: return -EINVAL; } @@ -360,6 +437,10 @@ vc4_vec_connector_get_property(struct drm_connector *connector, return -EINVAL; switch (state->tv.norm) { + case DRM_MODE_TV_NORM_NTSC_443: + *val = VC4_VEC_TV_MODE_NTSC_443; + break; + case DRM_MODE_TV_NORM_NTSC_J: *val = VC4_VEC_TV_MODE_NTSC_J; break; @@ -368,6 +449,10 @@ vc4_vec_connector_get_property(struct drm_connector *connector, *val = VC4_VEC_TV_MODE_NTSC; break; + case DRM_MODE_TV_NORM_PAL_60: + *val = VC4_VEC_TV_MODE_PAL_60; + break; + case DRM_MODE_TV_NORM_PAL_B: *val = VC4_VEC_TV_MODE_PAL; break; @@ -376,6 +461,14 @@ vc4_vec_connector_get_property(struct drm_connector *connector, *val = VC4_VEC_TV_MODE_PAL_M; break; + case DRM_MODE_TV_NORM_PAL_N: + *val = VC4_VEC_TV_MODE_PAL_N; + break; + + case DRM_MODE_TV_NORM_SECAM_B: + *val = VC4_VEC_TV_MODE_SECAM; + break; + default: return -EINVAL; } @@ -605,10 +698,13 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data) int ret; ret = drm_mode_create_tv_properties(drm, + DRM_MODE_TV_NORM_NTSC_443 | DRM_MODE_TV_NORM_NTSC_J | DRM_MODE_TV_NORM_NTSC_M | DRM_MODE_TV_NORM_PAL_B | - DRM_MODE_TV_NORM_PAL_M, + DRM_MODE_TV_NORM_PAL_M | + DRM_MODE_TV_NORM_PAL_N | + DRM_MODE_TV_NORM_SECAM_B, 0, NULL); if (ret) return ret;