From: "Noralf Trønnes" <noralf@tronnes.org>
To: Maxime Ripard <maxime@cerno.tech>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Ben Skeggs <bskeggs@redhat.com>, David Airlie <airlied@linux.ie>,
Maxime Ripard <mripard@kernel.org>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Emma Anholt <emma@anholt.net>, Karol Herbst <kherbst@redhat.com>,
Samuel Holland <samuel@sholland.org>,
Jani Nikula <jani.nikula@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Daniel Vetter <daniel@ffwll.ch>, Lyude Paul <lyude@redhat.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
Chen-Yu Tsai <wens@csie.org>
Cc: "Hans de Goede" <hdegoede@redhat.com>,
nouveau@lists.freedesktop.org,
"Geert Uytterhoeven" <geert@linux-m68k.org>,
"Dave Stevenson" <dave.stevenson@raspberrypi.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
"Phil Elwell" <phil@raspberrypi.com>,
intel-gfx@lists.freedesktop.org,
"Dom Cobley" <dom@raspberrypi.com>,
linux-sunxi@lists.linux.dev,
"Mateusz Kwiatkowski" <kfyatek+publicgit@gmail.com>,
dri-devel@lists.freedesktop.org,
"Noralf Trønnes" <noralf@tronnes.org>
Subject: Re: [PATCH v2 09/33] drm/connector: Add TV standard property
Date: Sat, 24 Sep 2022 17:52:29 +0200 [thread overview]
Message-ID: <80138f62-faec-5f7e-a8bd-235318a4e4c2@tronnes.org> (raw)
In-Reply-To: <20220728-rpi-analog-tv-properties-v2-9-f733a0ed9f90@cerno.tech>
Den 22.09.2022 16.25, skrev Maxime Ripard:
> The TV mode property has been around for a while now to select and get the
> current TV mode output on an analog TV connector.
>
> Despite that property name being generic, its content isn't and has been
> driver-specific which makes it hard to build any generic behaviour on top
> of it, both in kernel and user-space.
>
> Let's create a new enum tv norm property, that can contain any of the
> analog TV standards currently supported by kernel drivers. Each driver can
> then pass in a bitmask of the modes it supports, and the property
> creation function will filter out the modes not supported.
>
> We'll then be able to phase out the older tv mode property.
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
>
Please can you add per patch changelogs, it's hard to review when I have
to recall what might have happened with each patch. If you do it drm
style and put in the commit message it should be easy enough to do.
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index 4e4fbc9e0049..e7aa8de08f5b 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -980,6 +980,18 @@ static const struct drm_prop_enum_list drm_dvi_i_subconnector_enum_list[] = {
> DRM_ENUM_NAME_FN(drm_get_dvi_i_subconnector_name,
> drm_dvi_i_subconnector_enum_list)
>
> +static const struct drm_prop_enum_list drm_tv_mode_enum_list[] = {
> + { DRM_MODE_TV_MODE_NONE, "None" },
> + { DRM_MODE_TV_MODE_NTSC, "NTSC" },
I think going back to plain NTSC and PAL is a good choice for the common
variants.
> + { DRM_MODE_TV_MODE_NTSC_443, "NTSC-443" },
> + { DRM_MODE_TV_MODE_NTSC_J, "NTSC-J" },
> + { DRM_MODE_TV_MODE_PAL, "PAL" },
> + { DRM_MODE_TV_MODE_PAL_M, "PAL-M" },
> + { DRM_MODE_TV_MODE_PAL_N, "PAL-N" },
> + { DRM_MODE_TV_MODE_SECAM, "SECAM" },
> +};
> +DRM_ENUM_NAME_FN(drm_get_tv_mode_name, drm_tv_mode_enum_list)
> +
> static const struct drm_prop_enum_list drm_tv_select_enum_list[] = {
> { DRM_MODE_SUBCONNECTOR_Automatic, "Automatic" }, /* DVI-I and TV-out */
> { DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
> @@ -1645,6 +1657,10 @@ EXPORT_SYMBOL(drm_mode_create_tv_margin_properties);
> * responsible for allocating a list of format names and passing them to
> * this routine.
> *
> + * NOTE: This functions registers the deprecated "mode" connector
> + * property to select the analog TV mode (ie, NTSC, PAL, etc.). New
> + * drivers must use drm_mode_create_tv_properties() instead.
> + *
> * Returns:
> * 0 on success or a negative error code on failure.
> */
> @@ -1686,7 +1702,6 @@ int drm_mode_create_tv_properties_legacy(struct drm_device *dev,
> if (drm_mode_create_tv_margin_properties(dev))
> goto nomem;
>
> -
> if (num_modes) {
> dev->mode_config.legacy_tv_mode_property =
> drm_property_create(dev, DRM_MODE_PROP_ENUM,
> @@ -1735,6 +1750,49 @@ int drm_mode_create_tv_properties_legacy(struct drm_device *dev,
> }
> EXPORT_SYMBOL(drm_mode_create_tv_properties_legacy);
>
> +/**
> + * drm_mode_create_tv_properties - create TV specific connector properties
> + * @dev: DRM device
> + * @supported_tv_modes: Bitmask of TV modes supported (See DRM_MODE_TV_MODE_*)
> +
> + * Called by a driver's TV initialization routine, this function creates
> + * the TV specific connector properties for a given device. Caller is
> + * responsible for allocating a list of format names and passing them to
> + * this routine.
Copy-paste error, there are no format names in this version.
> + *
> + * Returns:
> + * 0 on success or a negative error code on failure.
> + */
> +int drm_mode_create_tv_properties(struct drm_device *dev,
> + unsigned int supported_tv_modes)
> +{
> + struct drm_prop_enum_list tv_mode_list[DRM_MODE_TV_MODE_MAX];
> + struct drm_property *tv_mode;
> + unsigned int i, len = 0;
> +
> + if (dev->mode_config.tv_mode_property)
> + return 0;
> +
> + for (i = 0; i < DRM_MODE_TV_MODE_MAX; i++) {
> + if (!(supported_tv_modes & BIT(i)))
> + continue;
> +
> + tv_mode_list[len].type = i;
> + tv_mode_list[len].name = drm_get_tv_mode_name(i);
> + len++;
> + }
> +
> + tv_mode = drm_property_create_enum(dev, 0, "TV mode",
> + tv_mode_list, len);
> + if (!tv_mode)
> + return -ENOMEM;
> +
> + dev->mode_config.tv_mode_property = tv_mode;
> +
> + return drm_mode_create_tv_properties_legacy(dev, 0, NULL);
> +}
> +EXPORT_SYMBOL(drm_mode_create_tv_properties);
> +
> /**
> * drm_mode_create_scaling_mode_property - create scaling mode property
> * @dev: DRM device
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index d566b4a4709c..fffacbfd0a45 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -143,6 +143,71 @@ enum subpixel_order {
>
> };
>
> +/**
> + * enum drm_connector_tv_mode - Analog TV output mode
> + *
> + * This enum is used to indicate the TV output mode used on an analog TV
> + * connector.
> + *
> + * WARNING: The values of this enum is uABI since they're exposed in the
> + * "TV mode" connector property.
> + */
> +enum drm_connector_tv_mode {
> + /**
> + * @DRM_MODE_TV_MODE_NONE: Placeholder to not default on one
> + * variant or the other when nothing is set.
> + */
> + DRM_MODE_TV_MODE_NONE = 0,
How is this supposed to be used?
Noralf.
> +
> + /**
> + * @DRM_MODE_TV_MODE_NTSC: CCIR System M (aka 525-lines)
> + * together with the NTSC Color Encoding.
> + */
> + DRM_MODE_TV_MODE_NTSC,
> +
> + /**
> + * @DRM_MODE_TV_MODE_NTSC_443: Variant of
> + * @DRM_MODE_TV_MODE_NTSC. Uses a color subcarrier frequency
> + * of 4.43 MHz.
> + */
> + DRM_MODE_TV_MODE_NTSC_443,
> +
> + /**
> + * @DRM_MODE_TV_MODE_NTSC_J: Variant of @DRM_MODE_TV_MODE_NTSC
> + * used in Japan. Uses a black level equals to the blanking
> + * level.
> + */
> + DRM_MODE_TV_MODE_NTSC_J,
> +
> + /**
> + * @DRM_MODE_TV_MODE_PAL: CCIR System B together with the PAL
> + * color system.
> + */
> + DRM_MODE_TV_MODE_PAL,
> +
> + /**
> + * @DRM_MODE_TV_MODE_PAL_M: CCIR System M (aka 525-lines)
> + * together with the PAL color encoding
> + */
> + DRM_MODE_TV_MODE_PAL_M,
> +
> + /**
> + * @DRM_MODE_TV_MODE_PAL_N: CCIR System N together with the PAL
> + * color encoding. It uses 625 lines, but has a color subcarrier
> + * frequency of 3.58MHz, the SECAM color space, and narrower
> + * channels compared to most of the other PAL variants.
> + */
> + DRM_MODE_TV_MODE_PAL_N,
> +
> + /**
> + * @DRM_MODE_TV_MODE_SECAM: CCIR System B together with the
> + * SECAM color system.
> + */
> + DRM_MODE_TV_MODE_SECAM,
> +
> + DRM_MODE_TV_MODE_MAX,
> +};
> +
> /**
> * struct drm_scrambling: sink's scrambling support.
> */
> @@ -696,6 +761,7 @@ struct drm_connector_tv_margins {
> * @subconnector: detected subconnector
> * @margins: TV margins
> * @legacy_mode: Legacy TV mode, driver specific value
> + * @mode: TV mode
> * @brightness: brightness in percent
> * @contrast: contrast in percent
> * @flicker_reduction: flicker reduction in percent
> @@ -708,6 +774,7 @@ struct drm_tv_connector_state {
> enum drm_mode_subconnector subconnector;
> struct drm_connector_tv_margins margins;
> unsigned int legacy_mode;
> + unsigned int mode;
> unsigned int brightness;
> unsigned int contrast;
> unsigned int flicker_reduction;
> @@ -1789,6 +1856,7 @@ const char *drm_get_subpixel_order_name(enum subpixel_order order);
> const char *drm_get_dpms_name(int val);
> const char *drm_get_dvi_i_subconnector_name(int val);
> const char *drm_get_dvi_i_select_name(int val);
> +const char *drm_get_tv_mode_name(int val);
> const char *drm_get_tv_subconnector_name(int val);
> const char *drm_get_tv_select_name(int val);
> const char *drm_get_dp_subconnector_name(int val);
> @@ -1802,6 +1870,8 @@ int drm_mode_create_tv_margin_properties(struct drm_device *dev);
> int drm_mode_create_tv_properties_legacy(struct drm_device *dev,
> unsigned int num_modes,
> const char * const modes[]);
> +int drm_mode_create_tv_properties(struct drm_device *dev,
> + unsigned int supported_tv_modes);
> void drm_connector_attach_tv_margin_properties(struct drm_connector *conn);
> int drm_mode_create_scaling_mode_property(struct drm_device *dev);
> int drm_connector_attach_content_type_property(struct drm_connector *dev);
> diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
> index 35a827175c24..10a6f7d1df0d 100644
> --- a/include/drm/drm_mode_config.h
> +++ b/include/drm/drm_mode_config.h
> @@ -718,9 +718,17 @@ struct drm_mode_config {
> /**
> * @legacy_tv_mode_property: Optional TV property to select
> * the output TV mode.
> + *
> + * Superseeded by @tv_mode_property
> */
> struct drm_property *legacy_tv_mode_property;
>
> + /**
> + * @tv_mode_property: Optional TV property to select the TV
> + * standard output on the connector.
> + */
> + struct drm_property *tv_mode_property;
> +
> /**
> * @tv_left_margin_property: Optional TV property to set the left
> * margin (expressed in pixels).
>
next prev parent reply other threads:[~2022-09-24 15:52 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-22 14:25 [PATCH v2 00/33] drm: Analog TV Improvements Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 01/33] drm/tests: Order Kunit tests in Makefile Maxime Ripard
2022-09-23 8:06 ` Thomas Zimmermann
2022-09-24 17:33 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 02/33] drm/tests: Add Kunit Helpers Maxime Ripard
2022-09-24 17:56 ` Noralf Trønnes
2022-09-24 18:06 ` Noralf Trønnes
2022-09-26 9:36 ` Maxime Ripard
2022-09-26 12:15 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 03/33] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity Maxime Ripard
2022-09-23 8:09 ` Thomas Zimmermann
2022-09-22 14:25 ` [PATCH v2 04/33] drm/connector: Rename subconnector state variable Maxime Ripard
2022-09-23 8:14 ` Thomas Zimmermann
2022-09-22 14:25 ` [PATCH v2 05/33] drm/atomic: Add TV subconnector property to get/set_property Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 06/33] drm/connector: Rename legacy TV property Maxime Ripard
2022-09-22 20:44 ` Lyude Paul
2022-09-23 8:19 ` Thomas Zimmermann
2022-09-26 9:50 ` Maxime Ripard
2022-09-26 12:34 ` Thomas Zimmermann
2022-09-24 15:38 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 07/33] drm/connector: Only register TV mode property if present Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 08/33] drm/connector: Rename drm_mode_create_tv_properties Maxime Ripard
2022-09-22 20:45 ` Lyude Paul
2022-09-24 15:43 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 09/33] drm/connector: Add TV standard property Maxime Ripard
2022-09-24 15:52 ` Noralf Trønnes [this message]
2022-09-26 10:01 ` Maxime Ripard
2022-09-26 12:59 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 10/33] drm/modes: Add a function to generate analog display modes Maxime Ripard
2022-09-23 9:05 ` Thomas Zimmermann
2022-09-23 9:18 ` Jani Nikula
2022-09-23 10:16 ` Thomas Zimmermann
2022-09-26 10:18 ` Maxime Ripard
2022-09-26 10:55 ` Thomas Zimmermann
2022-09-26 10:17 ` Maxime Ripard
2022-09-26 10:34 ` Geert Uytterhoeven
2022-09-26 11:17 ` Thomas Zimmermann
2022-09-26 12:42 ` Maxime Ripard
2022-09-26 13:02 ` Thomas Zimmermann
2022-09-22 14:25 ` [PATCH v2 11/33] drm/modes: Only consider bpp and refresh before options Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 12/33] drm/modes: parse_cmdline: Add support for named modes containing dashes Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 13/33] drm/client: Add some tests for drm_connector_pick_cmdline_mode() Maxime Ripard
2022-09-23 9:15 ` Thomas Zimmermann
2022-09-23 9:26 ` Javier Martinez Canillas
2022-09-23 10:30 ` Thomas Zimmermann
2022-09-23 11:01 ` Javier Martinez Canillas
2022-09-23 11:14 ` Maxime Ripard
2022-09-23 11:59 ` Jani Nikula
2022-09-22 14:25 ` [PATCH v2 14/33] drm/modes: Move named modes parsing to a separate function Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 15/33] drm/modes: Bail out of named mode parsing if empty Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 16/33] drm/modes: Bail out of named mode parsing early if it's a number Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 17/33] drm/modes: Bail out of named mode parsing early if it's an option Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 18/33] drm/modes: Bail out of named mode parsing early if it's a status Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 19/33] drm/modes: Switch to named mode descriptors Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 20/33] drm/modes: Fill drm_cmdline mode from named modes Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 21/33] drm/connector: Add pixel clock to cmdline mode Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 22/33] drm/connector: Add a function to lookup a TV mode by its name Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 23/33] drm/modes: Introduce the tv_mode property as a command-line option Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 24/33] drm/modes: Properly generate a drm_display_mode from a named mode Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 25/33] drm/modes: Introduce more named modes Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 26/33] drm/atomic-helper: Add a TV properties reset helper Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 27/33] drm/atomic-helper: Add an analog TV atomic_check implementation Maxime Ripard
2022-09-24 15:58 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 28/33] drm/vc4: vec: Fix definition of PAL-M mode Maxime Ripard
2022-09-24 15:59 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 29/33] drm/vc4: vec: Use TV Reset implementation Maxime Ripard
2022-09-22 14:25 ` [PATCH v2 30/33] drm/vc4: vec: Check for VEC output constraints Maxime Ripard
2022-09-24 16:00 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 31/33] drm/vc4: vec: Convert to the new TV mode property Maxime Ripard
2022-09-24 17:09 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 32/33] drm/vc4: vec: Add support for more analog TV standards Maxime Ripard
2022-09-24 17:12 ` Noralf Trønnes
2022-09-22 14:25 ` [PATCH v2 33/33] drm/sun4i: tv: Convert to the new TV mode property Maxime Ripard
2022-09-22 14:31 ` [PATCH v2 00/33] drm: Analog TV Improvements Maxime Ripard
2022-09-25 15:58 ` Noralf Trønnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=80138f62-faec-5f7e-a8bd-235318a4e4c2@tronnes.org \
--to=noralf@tronnes.org \
--cc=airlied@linux.ie \
--cc=bskeggs@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dave.stevenson@raspberrypi.com \
--cc=dom@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=geert@linux-m68k.org \
--cc=hdegoede@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jernej.skrabec@gmail.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=kfyatek+publicgit@gmail.com \
--cc=kherbst@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=lyude@redhat.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maxime@cerno.tech \
--cc=mripard@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=phil@raspberrypi.com \
--cc=rodrigo.vivi@intel.com \
--cc=samuel@sholland.org \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=tzimmermann@suse.de \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).