From: "Noralf Trønnes" <noralf@tronnes.org>
To: Maxime Ripard <maxime@cerno.tech>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Chen-Yu Tsai <wens@csie.org>, Karol Herbst <kherbst@redhat.com>,
Samuel Holland <samuel@sholland.org>,
Lyude Paul <lyude@redhat.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
Daniel Vetter <daniel@ffwll.ch>,
Thomas Zimmermann <tzimmermann@suse.de>,
Emma Anholt <emma@anholt.net>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Ben Skeggs <bskeggs@redhat.com>, David Airlie <airlied@linux.ie>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
dri-devel@lists.freedesktop.org,
"Geert Uytterhoeven" <geert@linux-m68k.org>,
intel-gfx@lists.freedesktop.org, linux-sunxi@lists.linux.dev,
"Hans de Goede" <hdegoede@redhat.com>,
nouveau@lists.freedesktop.org,
"Mateusz Kwiatkowski" <kfyatek+publicgit@gmail.com>,
"Dave Stevenson" <dave.stevenson@raspberrypi.com>,
linux-kernel@vger.kernel.org, "Dom Cobley" <dom@raspberrypi.com>,
"Phil Elwell" <phil@raspberrypi.com>,
"Noralf Trønnes" <noralf@tronnes.org>
Subject: Re: [PATCH v4 30/30] drm/sun4i: tv: Convert to the new TV mode property
Date: Sat, 1 Oct 2022 14:37:43 +0200 [thread overview]
Message-ID: <415275a6-7b3c-0550-6ed4-01245f385331@tronnes.org> (raw)
In-Reply-To: <20220728-rpi-analog-tv-properties-v4-30-60d38873f782@cerno.tech>
Den 29.09.2022 18.31, skrev Maxime Ripard:
> Now that the core can deal fine with analog TV modes, let's convert the
> sun4i TV driver to leverage those new features.
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---
> drivers/gpu/drm/sun4i/sun4i_tv.c | 148 ++++++++++++++-------------------------
> drivers/gpu/drm/vc4/vc4_vec.c | 5 +-
> 2 files changed, 54 insertions(+), 99 deletions(-)
>
> diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
> @@ -467,35 +398,46 @@ static const struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = {
>
> static int sun4i_tv_comp_get_modes(struct drm_connector *connector)
> {
> - int i;
> + struct drm_display_mode *mode;
> + int count = 0;
>
> - for (i = 0; i < ARRAY_SIZE(tv_modes); i++) {
> - struct drm_display_mode *mode;
> - const struct tv_mode *tv_mode = &tv_modes[i];
> -
> - mode = drm_mode_create(connector->dev);
> - if (!mode) {
> - DRM_ERROR("Failed to create a new display mode\n");
> - return 0;
> - }
> + mode = drm_mode_analog_ntsc_480i(connector->dev);
> + if (!mode) {
> + DRM_ERROR("Failed to create a new display mode\n");
> + return -ENOMEM;
> + }
>
> - strcpy(mode->name, tv_mode->name);
> + mode->type |= DRM_MODE_TYPE_PREFERRED;
> + drm_mode_probed_add(connector, mode);
> + count += 1;
>
> - sun4i_tv_mode_to_drm_mode(tv_mode, mode);
> - drm_mode_probed_add(connector, mode);
> + mode = drm_mode_analog_pal_576i(connector->dev);
> + if (!mode) {
> + DRM_ERROR("Failed to create a new display mode\n");
> + return -ENOMEM;
> }
>
> - return i;
> + drm_mode_probed_add(connector, mode);
> + count += 1;
> +
> + return count;
count is always 2 so you can just return 2.
Acked-by: Noralf Trønnes <noralf@tronnes.org>
> }
This stray hunk belongs to the vc4 TV mode patch I guess:
> diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
> index 8d37d7ba9b2a..88b4330bfa39 100644
> --- a/drivers/gpu/drm/vc4/vc4_vec.c
> +++ b/drivers/gpu/drm/vc4/vc4_vec.c
> @@ -322,7 +322,7 @@ vc4_vec_tv_mode_lookup(unsigned int mode)
> return NULL;
> }
>
> -static const struct drm_prop_enum_list tv_mode_names[] = {
> +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", },
> @@ -498,7 +498,8 @@ static int vc4_vec_connector_init(struct drm_device *dev, struct vc4_vec *vec)
> DRM_MODE_TV_MODE_NTSC);
>
> prop = drm_property_create_enum(dev, 0, "mode",
> - tv_mode_names, ARRAY_SIZE(tv_mode_names));
> + legacy_tv_mode_names,
> + ARRAY_SIZE(legacy_tv_mode_names));
> if (!prop)
> return -ENOMEM;
> vec->legacy_tv_mode_property = prop;
>
Noralf.
_______________________________________________
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-10-01 12:39 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 16:30 [PATCH v4 00/30] drm: Analog TV Improvements Maxime Ripard
2022-09-29 16:30 ` [PATCH v4 01/30] drm/docs: Remove unused TV Standard property Maxime Ripard
2022-09-30 11:34 ` Noralf Trønnes
2022-09-29 16:30 ` [PATCH v4 02/30] drm/tests: Order Kunit tests in Makefile Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:30 ` [PATCH v4 03/30] drm/tests: Add Kunit Helpers Maxime Ripard
2022-09-30 14:47 ` Noralf Trønnes
2022-09-29 16:30 ` [PATCH v4 04/30] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:30 ` [PATCH v4 05/30] drm/connector: Rename subconnector state variable Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 06/30] drm/atomic: Add TV subconnector property to get/set_property Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 07/30] drm/connector: Rename legacy TV property Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 08/30] drm/connector: Only register TV mode property if present Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 09/30] drm/connector: Rename drm_mode_create_tv_properties Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 10/30] drm/connector: Add TV standard property Maxime Ripard
2022-09-30 11:46 ` Noralf Trønnes
2022-09-29 16:31 ` [PATCH v4 11/30] drm/modes: Add a function to generate analog display modes Maxime Ripard
2022-10-01 12:52 ` Noralf Trønnes
2022-10-13 8:36 ` Maxime Ripard
2022-10-15 15:04 ` Noralf Trønnes
2022-10-18 7:34 ` Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 12/30] drm/modes: Only consider bpp and refresh before options Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 13/30] drm/modes: parse_cmdline: Add support for named modes containing dashes Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 14/30] drm/client: Add some tests for drm_connector_pick_cmdline_mode() Maxime Ripard
2022-10-01 17:42 ` Maíra Canal
2022-09-29 16:31 ` [PATCH v4 15/30] drm/modes: Move named modes parsing to a separate function Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 16/30] drm/modes: Switch to named mode descriptors Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 17/30] drm/modes: Fill drm_cmdline mode from named modes Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 18/30] drm/connector: Add pixel clock to cmdline mode Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 19/30] drm/connector: Add a function to lookup a TV mode by its name Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 20/30] drm/modes: Introduce the tv_mode property as a command-line option Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 21/30] drm/modes: Properly generate a drm_display_mode from a named mode Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 22/30] drm/modes: Introduce more named modes Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 23/30] drm/atomic-helper: Add a TV properties reset helper Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 24/30] drm/atomic-helper: Add an analog TV atomic_check implementation Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 25/30] drm/vc4: vec: Fix definition of PAL-M mode Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 26/30] drm/vc4: vec: Use TV Reset implementation Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 27/30] drm/vc4: vec: Check for VEC output constraints Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 28/30] drm/vc4: vec: Convert to the new TV mode property Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 29/30] drm/vc4: vec: Add support for more analog TV standards Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 30/30] drm/sun4i: tv: Convert to the new TV mode property Maxime Ripard
2022-10-01 12:37 ` Noralf Trønnes [this message]
2022-10-01 13:12 ` [PATCH v4 00/30] drm: Analog TV Improvements Noralf Trønnes
2022-10-10 12:11 ` Maxime Ripard
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=415275a6-7b3c-0550-6ed4-01245f385331@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).