From: Maxime Ripard <maxime@cerno.tech>
To: "Maxime Ripard" <mripard@kernel.org>,
"Ben Skeggs" <bskeggs@redhat.com>,
"David Airlie" <airlied@linux.ie>, "Chen-Yu Tsai" <wens@csie.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"Lyude Paul" <lyude@redhat.com>,
"Philipp Zabel" <p.zabel@pengutronix.de>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Tvrtko Ursulin" <tvrtko.ursulin@linux.intel.com>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Samuel Holland" <samuel@sholland.org>,
"Karol Herbst" <kherbst@redhat.com>,
"Noralf Trønnes" <noralf@tronnes.org>,
"Emma Anholt" <emma@anholt.net>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>
Cc: Maxime Ripard <maxime@cerno.tech>,
Hans de Goede <hdegoede@redhat.com>,
linux-arm-kernel@lists.infradead.org,
Phil Elwell <phil@raspberrypi.com>,
intel-gfx@lists.freedesktop.org,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
dri-devel@lists.freedesktop.org, Dom Cobley <dom@raspberrypi.com>,
linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org,
linux-sunxi@lists.linux.dev,
Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v2 06/41] drm/connector: Rename legacy TV property
Date: Mon, 29 Aug 2022 15:11:20 +0200 [thread overview]
Message-ID: <20220728-rpi-analog-tv-properties-v2-6-459522d653a7@cerno.tech> (raw)
In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech>
The current tv_mode has driver-specific values that don't allow to
easily share code using it, either at the userspace or kernel level.
Since we're going to introduce a new, generic, property that fit the
same purpose, let's rename this one to legacy_tv_mode to make it
obvious we should move away from it.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index c06d0639d552..7f2b9a07fbdf 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -698,8 +698,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
state->tv.margins.top = val;
} else if (property == config->tv_bottom_margin_property) {
state->tv.margins.bottom = val;
- } else if (property == config->tv_mode_property) {
- state->tv.mode = val;
+ } else if (property == config->legacy_tv_mode_property) {
+ state->tv.legacy_mode = val;
} else if (property == config->tv_brightness_property) {
state->tv.brightness = val;
} else if (property == config->tv_contrast_property) {
@@ -808,8 +808,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector,
*val = state->tv.margins.top;
} else if (property == config->tv_bottom_margin_property) {
*val = state->tv.margins.bottom;
- } else if (property == config->tv_mode_property) {
- *val = state->tv.mode;
+ } else if (property == config->legacy_tv_mode_property) {
+ *val = state->tv.legacy_mode;
} else if (property == config->tv_brightness_property) {
*val = state->tv.brightness;
} else if (property == config->tv_contrast_property) {
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index e3142c8142b3..ede6025638d7 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -1686,14 +1686,14 @@ int drm_mode_create_tv_properties(struct drm_device *dev,
if (drm_mode_create_tv_margin_properties(dev))
goto nomem;
- dev->mode_config.tv_mode_property =
+ dev->mode_config.legacy_tv_mode_property =
drm_property_create(dev, DRM_MODE_PROP_ENUM,
"mode", num_modes);
- if (!dev->mode_config.tv_mode_property)
+ if (!dev->mode_config.legacy_tv_mode_property)
goto nomem;
for (i = 0; i < num_modes; i++)
- drm_property_add_enum(dev->mode_config.tv_mode_property,
+ drm_property_add_enum(dev->mode_config.legacy_tv_mode_property,
i, modes[i]);
dev->mode_config.tv_brightness_property =
diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_connector.c
index fa636206f232..caf82e9095b4 100644
--- a/drivers/gpu/drm/gud/gud_connector.c
+++ b/drivers/gpu/drm/gud/gud_connector.c
@@ -424,7 +424,7 @@ gud_connector_property_lookup(struct drm_connector *connector, u16 prop)
case GUD_PROPERTY_TV_BOTTOM_MARGIN:
return config->tv_bottom_margin_property;
case GUD_PROPERTY_TV_MODE:
- return config->tv_mode_property;
+ return config->legacy_tv_mode_property;
case GUD_PROPERTY_TV_BRIGHTNESS:
return config->tv_brightness_property;
case GUD_PROPERTY_TV_CONTRAST:
diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c
index b91e48d2190d..d29b63fd6178 100644
--- a/drivers/gpu/drm/i2c/ch7006_drv.c
+++ b/drivers/gpu/drm/i2c/ch7006_drv.c
@@ -264,7 +264,7 @@ static int ch7006_encoder_create_resources(struct drm_encoder *encoder,
priv->hmargin);
drm_object_attach_property(&connector->base, conf->tv_bottom_margin_property,
priv->vmargin);
- drm_object_attach_property(&connector->base, conf->tv_mode_property,
+ drm_object_attach_property(&connector->base, conf->legacy_tv_mode_property,
priv->norm);
drm_object_attach_property(&connector->base, conf->tv_brightness_property,
priv->brightness);
@@ -315,7 +315,7 @@ static int ch7006_encoder_set_property(struct drm_encoder *encoder,
ch7006_load_reg(client, state, CH7006_POV);
ch7006_load_reg(client, state, CH7006_VPOS);
- } else if (property == conf->tv_mode_property) {
+ } else if (property == conf->legacy_tv_mode_property) {
if (connector->dpms != DRM_MODE_DPMS_OFF)
return -EINVAL;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index be28e7bd7490..1a15534adc60 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -662,7 +662,7 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder,
conf->tv_subconnector_property,
tv_enc->subconnector);
drm_object_attach_property(&connector->base,
- conf->tv_mode_property,
+ conf->legacy_tv_mode_property,
tv_enc->tv_norm);
drm_object_attach_property(&connector->base,
conf->tv_flicker_reduction_property,
@@ -722,7 +722,7 @@ static int nv17_tv_set_property(struct drm_encoder *encoder,
if (encoder->crtc)
nv17_tv_update_rescaler(encoder);
- } else if (property == conf->tv_mode_property) {
+ } else if (property == conf->legacy_tv_mode_property) {
if (connector->dpms != DRM_MODE_DPMS_OFF)
return -EINVAL;
diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
index 4a788c1c9058..dc33b7b9ce5e 100644
--- a/drivers/gpu/drm/vc4/vc4_vec.c
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -366,7 +366,7 @@ static int vc4_vec_connector_init(struct drm_device *dev, struct vc4_vec *vec)
drm_connector_helper_add(connector, &vc4_vec_connector_helper_funcs);
drm_object_attach_property(&connector->base,
- dev->mode_config.tv_mode_property,
+ dev->mode_config.legacy_tv_mode_property,
VC4_VEC_TV_MODE_NTSC);
vec->tv_mode = &vc4_vec_tv_modes[VC4_VEC_TV_MODE_NTSC];
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 1d5e3cccb9e3..5cfad8b6ad83 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -695,7 +695,7 @@ struct drm_connector_tv_margins {
* @select_subconnector: selected subconnector
* @subconnector: detected subconnector
* @margins: TV margins
- * @mode: TV mode
+ * @legacy_mode: Legacy TV mode, driver specific value
* @brightness: brightness in percent
* @contrast: contrast in percent
* @flicker_reduction: flicker reduction in percent
@@ -707,7 +707,7 @@ struct drm_tv_connector_state {
enum drm_mode_subconnector select_subconnector;
enum drm_mode_subconnector subconnector;
struct drm_connector_tv_margins margins;
- unsigned int mode;
+ unsigned int legacy_mode;
unsigned int brightness;
unsigned int contrast;
unsigned int flicker_reduction;
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index 6b5e01295348..35a827175c24 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -714,11 +714,13 @@ struct drm_mode_config {
* between different TV connector types.
*/
struct drm_property *tv_select_subconnector_property;
+
/**
- * @tv_mode_property: Optional TV property to select
+ * @legacy_tv_mode_property: Optional TV property to select
* the output TV mode.
*/
- struct drm_property *tv_mode_property;
+ struct drm_property *legacy_tv_mode_property;
+
/**
* @tv_left_margin_property: Optional TV property to set the left
* margin (expressed in pixels).
--
b4 0.10.0-dev-65ba7
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-08-29 13:17 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-29 13:11 [PATCH v2 00/41] drm: Analog TV Improvements Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 01/41] drm/tests: Order Kunit tests in Makefile Maxime Ripard
2022-08-29 18:46 ` Noralf Trønnes
2022-08-29 19:02 ` Konstantin Ryabitsev
2022-08-30 8:30 ` Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 02/41] drm/tests: Add Kunit Helpers Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 03/41] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 04/41] drm/connector: Rename subconnector state variable Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 05/41] drm/atomic: Add TV subconnector property to get/set_property Maxime Ripard
2022-08-29 13:11 ` Maxime Ripard [this message]
2022-08-30 19:27 ` [PATCH v2 06/41] drm/connector: Rename legacy TV property Noralf Trønnes
2022-08-29 13:11 ` [PATCH v2 07/41] drm/connector: Only register TV mode property if present Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 08/41] drm/connector: Rename drm_mode_create_tv_properties Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 09/41] drm/connector: Add TV standard property Maxime Ripard
2022-09-01 22:00 ` Mateusz Kwiatkowski
2022-09-02 7:35 ` Geert Uytterhoeven
2022-09-07 12:11 ` Maxime Ripard
2022-09-07 12:10 ` Maxime Ripard
2022-09-07 19:52 ` Mateusz Kwiatkowski
2022-09-09 9:46 ` Maxime Ripard
2022-09-11 4:32 ` Mateusz Kwiatkowski
2022-09-05 10:18 ` Noralf Trønnes
2022-08-29 13:11 ` [PATCH v2 10/41] drm/modes: Add a function to generate analog display modes Maxime Ripard
2022-08-30 13:01 ` Maíra Canal
2022-09-08 11:10 ` Maxime Ripard
2022-08-31 1:44 ` Mateusz Kwiatkowski
2022-08-31 8:14 ` Geert Uytterhoeven
2022-09-05 13:32 ` Maxime Ripard
2022-09-05 16:32 ` Mateusz Kwiatkowski
2022-09-07 14:38 ` Maxime Ripard
2022-09-05 13:37 ` Maxime Ripard
2022-09-05 16:44 ` Mateusz Kwiatkowski
2022-09-07 14:34 ` Maxime Ripard
2022-09-07 21:31 ` Mateusz Kwiatkowski
2022-09-09 13:54 ` Maxime Ripard
2022-09-11 4:48 ` Mateusz Kwiatkowski
2022-09-11 4:51 ` Mateusz Kwiatkowski
2022-09-21 15:05 ` Maxime Ripard
2022-09-09 14:00 ` Maxime Ripard
2022-09-11 4:30 ` kFYatek
2022-09-21 14:26 ` Maxime Ripard
2022-09-01 19:09 ` Noralf Trønnes
2022-08-29 13:11 ` [PATCH v2 11/41] drm/modes: Only consider bpp and refresh before options Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 12/41] drm/modes: parse_cmdline: Add support for named modes containing dashes Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 13/41] drm/client: Add some tests for drm_connector_pick_cmdline_mode() Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 14/41] drm/modes: Move named modes parsing to a separate function Maxime Ripard
2022-08-30 10:06 ` Geert Uytterhoeven
2022-08-30 10:43 ` Jani Nikula
2022-08-30 12:03 ` Maxime Ripard
2022-08-30 13:36 ` Jani Nikula
2022-09-07 8:39 ` Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 15/41] drm/modes: Switch to named mode descriptors Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 16/41] drm/modes: Fill drm_cmdline mode from named modes Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 17/41] drm/connector: Add pixel clock to cmdline mode Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 18/41] drm/connector: Add a function to lookup a TV mode by its name Maxime Ripard
2022-08-31 19:14 ` Noralf Trønnes
2022-08-29 13:11 ` [PATCH v2 19/41] drm/modes: Introduce the tv_mode property as a command-line option Maxime Ripard
2022-08-30 12:34 ` Maíra Canal
2022-08-30 12:44 ` Maíra Canal
2022-09-01 22:46 ` Mateusz Kwiatkowski
2022-09-05 14:28 ` Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 20/41] drm/modes: Properly generate a drm_display_mode from a named mode Maxime Ripard
2022-09-01 22:52 ` Mateusz Kwiatkowski
2022-08-29 13:11 ` [PATCH v2 21/41] drm/modes: Introduce more named modes Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 22/41] drm/atomic-helper: Add a TV properties reset helper Maxime Ripard
2022-08-30 18:40 ` Noralf Trønnes
2022-08-29 13:11 ` [PATCH v2 23/41] drm/atomic-helper: Add an analog TV atomic_check implementation Maxime Ripard
2022-08-30 18:49 ` Noralf Trønnes
2022-08-29 13:11 ` [PATCH v2 24/41] drm/vc4: vec: Remove empty mode_fixup Maxime Ripard
2022-08-30 15:23 ` Noralf Trønnes
2022-09-07 8:34 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 25/41] drm/vc4: vec: Convert to atomic helpers Maxime Ripard
2022-08-30 15:24 ` Noralf Trønnes
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 26/41] drm/vc4: vec: Refactor VEC TV mode setting Maxime Ripard
2022-08-30 15:29 ` Noralf Trønnes
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 27/41] drm/vc4: vec: Remove redundant atomic_mode_set Maxime Ripard
2022-08-30 15:45 ` Noralf Trønnes
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 28/41] drm/vc4: vec: Fix timings for VEC modes Maxime Ripard
2022-08-30 18:20 ` Noralf Trønnes
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 29/41] drm/vc4: vec: Switch for common modes Maxime Ripard
2022-08-30 18:36 ` Noralf Trønnes
2022-08-29 13:11 ` [PATCH v2 30/41] drm/vc4: vec: Fix definition of PAL-M mode Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 31/41] drm/vc4: vec: Use TV Reset implementation Maxime Ripard
2022-08-30 18:51 ` Noralf Trønnes
2022-08-29 13:11 ` [PATCH v2 32/41] drm/vc4: vec: Convert to the new TV mode property Maxime Ripard
2022-08-30 19:01 ` Noralf Trønnes
2022-09-08 11:23 ` Maxime Ripard
2022-09-08 11:31 ` Mateusz Kwiatkowski
2022-09-08 12:16 ` Maxime Ripard
2022-09-08 11:34 ` Noralf Trønnes
2022-08-31 2:23 ` Mateusz Kwiatkowski
2022-09-08 13:18 ` Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 33/41] drm/vc4: vec: Add support for more analog TV standards Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 34/41] drm/sun4i: tv: Remove unused mode_valid Maxime Ripard
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 35/41] drm/sun4i: tv: Convert to atomic hooks Maxime Ripard
2022-09-06 20:02 ` Jernej Škrabec
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 36/41] drm/sun4i: tv: Merge mode_set into atomic_enable Maxime Ripard
2022-09-06 20:04 ` Jernej Škrabec
2022-09-07 7:41 ` Maxime Ripard
2022-09-07 15:09 ` Jernej Škrabec
2022-09-08 14:02 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 37/41] drm/sun4i: tv: Remove useless function Maxime Ripard
2022-09-06 20:06 ` Jernej Škrabec
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 38/41] drm/sun4i: tv: Remove useless destroy function Maxime Ripard
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 39/41] drm/sun4i: tv: Rename error label Maxime Ripard
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 40/41] drm/sun4i: tv: Add missing reset assertion Maxime Ripard
2022-09-07 8:35 ` (subset) " Maxime Ripard
2022-08-29 13:11 ` [PATCH v2 41/41] drm/sun4i: tv: Convert to the new TV mode property Maxime Ripard
2022-09-01 19:35 ` [PATCH v2 00/41] drm: Analog TV Improvements Noralf Trønnes
2022-09-02 11:28 ` Noralf Trønnes
2022-09-05 14:57 ` Maxime Ripard
2022-09-05 15:17 ` Noralf Trønnes
2022-09-07 9:58 ` Maxime Ripard
2022-09-07 10:56 ` Noralf Trønnes
2022-09-07 10:36 ` Stefan Wahren
2022-09-07 16:44 ` Noralf Trønnes
2022-09-10 15:34 ` Noralf Trønnes
2022-09-21 14:03 ` Maxime Ripard
2022-09-24 15:33 ` 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=20220728-rpi-analog-tv-properties-v2-6-459522d653a7@cerno.tech \
--to=maxime@cerno.tech \
--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=mripard@kernel.org \
--cc=noralf@tronnes.org \
--cc=nouveau@lists.freedesktop.org \
--cc=p.zabel@pengutronix.de \
--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).