From: Maxime Ripard <maxime@cerno.tech>
To: "Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Martin Blumenstingl" <martin.blumenstingl@googlemail.com>,
"Chen-Yu Tsai" <wens@csie.org>,
"Philipp Zabel" <p.zabel@pengutronix.de>,
"Jerome Brunet" <jbrunet@baylibre.com>,
"Samuel Holland" <samuel@sholland.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Emma Anholt" <emma@anholt.net>,
"David Airlie" <airlied@linux.ie>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Noralf Trønnes" <noralf@tronnes.org>,
"Kevin Hilman" <khilman@baylibre.com>,
"Neil Armstrong" <narmstrong@baylibre.com>,
"Maxime Ripard" <mripard@kernel.org>
Cc: Dom Cobley <dom@raspberrypi.com>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Maxime Ripard <maxime@cerno.tech>,
linux-amlogic@lists.infradead.org, linux-sunxi@lists.linux.dev,
Phil Elwell <phil@raspberrypi.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v1 32/35] drm/sun4i: tv: Convert to the new TV mode property
Date: Fri, 29 Jul 2022 18:35:15 +0200 [thread overview]
Message-ID: <20220728-rpi-analog-tv-properties-v1-32-3d53ae722097@cerno.tech> (raw)
In-Reply-To: <20220728-rpi-analog-tv-properties-v1-0-3d53ae722097@cerno.tech>
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>
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
index 74ff5ad6a8b9..bed52423776e 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
@@ -140,23 +140,15 @@ struct resync_parameters {
struct tv_mode {
char *name;
+ unsigned int tv_mode;
+ const struct drm_display_mode *display_mode;
+
u32 mode;
u32 chroma_freq;
u16 back_porch;
u16 front_porch;
- u16 line_number;
u16 vblank_level;
- u32 hdisplay;
- u16 hfront_porch;
- u16 hsync_len;
- u16 hback_porch;
-
- u32 vdisplay;
- u16 vfront_porch;
- u16 vsync_len;
- u16 vback_porch;
-
bool yc_en;
bool dac3_en;
bool dac_bit25_en;
@@ -212,7 +204,8 @@ static const struct resync_parameters pal_resync_parameters = {
static const struct tv_mode tv_modes[] = {
{
- .name = "NTSC",
+ .tv_mode = DRM_MODE_TV_NORM_NTSC_M,
+ .display_mode = &drm_mode_480i,
.mode = SUN4I_TVE_CFG0_RES_480i,
.chroma_freq = 0x21f07c1f,
.yc_en = true,
@@ -221,17 +214,6 @@ static const struct tv_mode tv_modes[] = {
.back_porch = 118,
.front_porch = 32,
- .line_number = 525,
-
- .hdisplay = 720,
- .hfront_porch = 18,
- .hsync_len = 2,
- .hback_porch = 118,
-
- .vdisplay = 480,
- .vfront_porch = 26,
- .vsync_len = 2,
- .vback_porch = 17,
.vblank_level = 240,
@@ -241,23 +223,13 @@ static const struct tv_mode tv_modes[] = {
.resync_params = &ntsc_resync_parameters,
},
{
- .name = "PAL",
+ .tv_mode = DRM_MODE_TV_NORM_PAL_B,
+ .display_mode = &drm_mode_576i,
.mode = SUN4I_TVE_CFG0_RES_576i,
.chroma_freq = 0x2a098acb,
.back_porch = 138,
.front_porch = 24,
- .line_number = 625,
-
- .hdisplay = 720,
- .hfront_porch = 3,
- .hsync_len = 2,
- .hback_porch = 139,
-
- .vdisplay = 576,
- .vfront_porch = 28,
- .vsync_len = 2,
- .vback_porch = 19,
.vblank_level = 252,
@@ -275,63 +247,21 @@ drm_encoder_to_sun4i_tv(struct drm_encoder *encoder)
encoder);
}
-/*
- * FIXME: If only the drm_display_mode private field was usable, this
- * could go away...
- *
- * So far, it doesn't seem to be preserved when the mode is passed by
- * to mode_set for some reason.
- */
-static const struct tv_mode *sun4i_tv_find_tv_by_mode(const struct drm_display_mode *mode)
+static const struct tv_mode *
+sun4i_tv_find_tv_by_mode(unsigned int mode)
{
int i;
- /* First try to identify the mode by name */
for (i = 0; i < ARRAY_SIZE(tv_modes); i++) {
const struct tv_mode *tv_mode = &tv_modes[i];
- DRM_DEBUG_DRIVER("Comparing mode %s vs %s",
- mode->name, tv_mode->name);
-
- if (!strcmp(mode->name, tv_mode->name))
- return tv_mode;
- }
-
- /* Then by number of lines */
- for (i = 0; i < ARRAY_SIZE(tv_modes); i++) {
- const struct tv_mode *tv_mode = &tv_modes[i];
-
- DRM_DEBUG_DRIVER("Comparing mode %s vs %s (X: %d vs %d)",
- mode->name, tv_mode->name,
- mode->vdisplay, tv_mode->vdisplay);
-
- if (mode->vdisplay == tv_mode->vdisplay)
+ if (tv_mode->tv_mode == mode)
return tv_mode;
}
return NULL;
}
-static void sun4i_tv_mode_to_drm_mode(const struct tv_mode *tv_mode,
- struct drm_display_mode *mode)
-{
- DRM_DEBUG_DRIVER("Creating mode %s\n", mode->name);
-
- mode->type = DRM_MODE_TYPE_DRIVER;
- mode->clock = 13500;
- mode->flags = DRM_MODE_FLAG_INTERLACE;
-
- mode->hdisplay = tv_mode->hdisplay;
- mode->hsync_start = mode->hdisplay + tv_mode->hfront_porch;
- mode->hsync_end = mode->hsync_start + tv_mode->hsync_len;
- mode->htotal = mode->hsync_end + tv_mode->hback_porch;
-
- mode->vdisplay = tv_mode->vdisplay;
- mode->vsync_start = mode->vdisplay + tv_mode->vfront_porch;
- mode->vsync_end = mode->vsync_start + tv_mode->vsync_len;
- mode->vtotal = mode->vsync_end + tv_mode->vback_porch;
-}
-
static void sun4i_tv_disable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
{
@@ -355,7 +285,11 @@ static void sun4i_tv_enable(struct drm_encoder *encoder,
struct drm_crtc_state *crtc_state =
drm_atomic_get_new_crtc_state(state, encoder->crtc);
struct drm_display_mode *mode = &crtc_state->mode;
- const struct tv_mode *tv_mode = sun4i_tv_find_tv_by_mode(mode);
+ struct drm_connector *connector = &tv->connector;
+ struct drm_connector_state *conn_state =
+ drm_atomic_get_new_connector_state(state, connector);
+ const struct tv_mode *tv_mode =
+ sun4i_tv_find_tv_by_mode(conn_state->tv.norm);
DRM_DEBUG_DRIVER("Enabling the TV Output\n");
@@ -403,7 +337,7 @@ static void sun4i_tv_enable(struct drm_encoder *encoder,
/* Set the lines setup */
regmap_write(tv->regs, SUN4I_TVE_LINE_REG,
SUN4I_TVE_LINE_FIRST(22) |
- SUN4I_TVE_LINE_NUMBER(tv_mode->line_number));
+ SUN4I_TVE_LINE_NUMBER(mode->vtotal));
regmap_write(tv->regs, SUN4I_TVE_LEVEL_REG,
SUN4I_TVE_LEVEL_BLANK(tv_mode->video_levels->blank) |
@@ -472,15 +406,12 @@ static int sun4i_tv_comp_get_modes(struct drm_connector *connector)
struct drm_display_mode *mode;
const struct tv_mode *tv_mode = &tv_modes[i];
- mode = drm_mode_create(connector->dev);
+ mode = drm_mode_duplicate(connector->dev, tv_mode->display_mode);
if (!mode) {
DRM_ERROR("Failed to create a new display mode\n");
return 0;
}
- strcpy(mode->name, tv_mode->name);
-
- sun4i_tv_mode_to_drm_mode(tv_mode, mode);
drm_mode_probed_add(connector, mode);
}
@@ -488,13 +419,20 @@ static int sun4i_tv_comp_get_modes(struct drm_connector *connector)
}
static const struct drm_connector_helper_funcs sun4i_tv_comp_connector_helper_funcs = {
+ .atomic_check = drm_atomic_helper_connector_tv_check,
.get_modes = sun4i_tv_comp_get_modes,
};
+static void sun4i_tv_connector_reset(struct drm_connector *connector)
+{
+ drm_atomic_helper_connector_reset(connector);
+ drm_atomic_helper_connector_tv_reset(connector);
+}
+
static const struct drm_connector_funcs sun4i_tv_comp_connector_funcs = {
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = drm_connector_cleanup,
- .reset = drm_atomic_helper_connector_reset,
+ .reset = sun4i_tv_connector_reset,
.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
};
@@ -586,8 +524,17 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,
drm_connector_attach_encoder(&tv->connector, &tv->encoder);
+ ret = drm_mode_create_tv_properties(drm,
+ DRM_MODE_TV_NORM_NTSC_M |
+ DRM_MODE_TV_NORM_PAL_B,
+ 0, NULL);
+ if (ret)
+ goto err_cleanup_connector;
+
return 0;
+err_cleanup_connector:
+ drm_connector_cleanup(&tv->connector);
err_cleanup_encoder:
drm_encoder_cleanup(&tv->encoder);
err_disable_clk:
--
b4 0.10.0-dev-49460
next prev parent reply other threads:[~2022-07-29 16:46 UTC|newest]
Thread overview: 151+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 16:34 [PATCH v1 00/35] drm: Analog TV Improvements Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 01/35] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity Maxime Ripard
2022-08-08 12:25 ` Noralf Trønnes
2022-07-29 16:34 ` [PATCH v1 02/35] drm/connector: Rename subconnector state variable Maxime Ripard
2022-08-08 12:26 ` Noralf Trønnes
2022-07-29 16:34 ` [PATCH v1 03/35] drm/atomic: Add TV subconnector property to get/set_property Maxime Ripard
2022-08-08 12:30 ` Noralf Trønnes
2022-08-15 7:35 ` Maxime Ripard
2022-08-15 10:48 ` Noralf Trønnes
2022-07-29 16:34 ` [PATCH v1 04/35] drm/modes: Introduce 480i and 576i modes Maxime Ripard
2022-08-02 13:58 ` Jani Nikula
2022-08-02 14:16 ` Thomas Zimmermann
2022-08-16 11:58 ` Maxime Ripard
2022-08-12 13:18 ` Geert Uytterhoeven
2022-08-16 13:26 ` Maxime Ripard
2022-08-16 15:00 ` Geert Uytterhoeven
2022-08-17 7:53 ` Maxime Ripard
2022-08-17 8:51 ` Geert Uytterhoeven
2022-08-17 13:14 ` Maxime Ripard
2022-08-17 14:01 ` Geert Uytterhoeven
2022-08-18 12:39 ` Maxime Ripard
2022-08-18 12:57 ` Geert Uytterhoeven
2022-08-18 13:42 ` Maxime Ripard
2022-08-18 15:34 ` Geert Uytterhoeven
2022-08-18 15:46 ` Maxime Ripard
2022-08-18 15:56 ` Geert Uytterhoeven
2022-08-24 16:42 ` Mateusz Kwiatkowski
2022-08-29 13:29 ` Maxime Ripard
2022-08-29 14:14 ` Geert Uytterhoeven
2022-08-29 14:33 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 05/35] drm/connector: Add TV standard property Maxime Ripard
2022-08-08 12:44 ` Noralf Trønnes
2022-08-16 8:26 ` Maxime Ripard
2022-08-16 9:42 ` Noralf Trønnes
2022-08-16 9:49 ` Maxime Ripard
2022-08-16 19:35 ` Noralf Trønnes
2022-08-17 11:46 ` Maxime Ripard
2022-08-17 13:11 ` Noralf Trønnes
2022-08-17 23:23 ` Noralf Trønnes
2022-08-18 15:01 ` Noralf Trønnes
2022-08-18 15:31 ` Maxime Ripard
2022-08-21 11:43 ` Noralf Trønnes
2022-08-26 8:21 ` Maxime Ripard
2022-08-18 15:27 ` Maxime Ripard
2022-08-12 13:25 ` Geert Uytterhoeven
2022-08-16 13:20 ` Maxime Ripard
2022-08-16 13:29 ` Geert Uytterhoeven
2022-08-16 14:11 ` Maxime Ripard
2022-08-16 14:43 ` Geert Uytterhoeven
2022-08-16 15:49 ` Maxime Ripard
2022-08-17 7:31 ` Geert Uytterhoeven
2022-08-17 7:32 ` Geert Uytterhoeven
2022-08-17 7:47 ` Maxime Ripard
2022-08-17 8:35 ` Geert Uytterhoeven
2022-08-17 11:14 ` Maxime Ripard
2022-08-17 13:05 ` Geert Uytterhoeven
2022-08-17 13:18 ` Maxime Ripard
2022-08-17 14:04 ` Geert Uytterhoeven
2022-08-18 14:54 ` Maxime Ripard
2022-08-18 15:20 ` Geert Uytterhoeven
2022-08-18 15:34 ` Maxime Ripard
2022-08-19 9:35 ` Geert Uytterhoeven
2022-08-25 13:39 ` Maxime Ripard
2022-08-20 20:12 ` Noralf Trønnes
2022-08-25 13:44 ` Maxime Ripard
2022-08-25 15:13 ` Noralf Trønnes
2022-08-29 8:28 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 06/35] drm/connector: Only register TV mode property if present Maxime Ripard
2022-08-08 12:49 ` Noralf Trønnes
2022-08-15 10:40 ` Maxime Ripard
2022-08-15 10:49 ` Noralf Trønnes
2022-07-29 16:34 ` [PATCH v1 07/35] drm/modes: Only consider bpp and refresh before options Maxime Ripard
2022-08-12 13:25 ` Geert Uytterhoeven
2022-08-16 12:20 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 08/35] drm/client: Add some tests for drm_connector_pick_cmdline_mode() Maxime Ripard
2022-08-02 10:14 ` Thomas Zimmermann
2022-08-15 8:42 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 09/35] drm/modes: Move named modes parsing to a separate function Maxime Ripard
2022-08-12 13:27 ` Geert Uytterhoeven
2022-08-16 13:46 ` Maxime Ripard
2022-08-16 14:44 ` Geert Uytterhoeven
2022-07-29 16:34 ` [PATCH v1 10/35] drm/modes: Switch to named mode descriptors Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 11/35] drm/modes: Fill drm_cmdline mode from named modes Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 12/35] drmi/modes: Properly generate a drm_display_mode from a named mode Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 13/35] drm/atomic-helper: Add a TV properties reset helper Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 14/35] drm/atomic-helper: Add an analog TV atomic_check implementation Maxime Ripard
2022-07-29 17:16 ` Mateusz Kwiatkowski
2022-08-15 8:30 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 15/35] drm/vc4: vec: Remove empty mode_fixup Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 16/35] drm/vc4: vec: Convert to atomic helpers Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 17/35] drm/vc4: vec: Refactor VEC TV mode setting Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 18/35] drm/vc4: vec: Remove redundant atomic_mode_set Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 19/35] drm/vc4: vec: Fix timings for VEC modes Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 20/35] drm/vc4: vec: Switch for common modes Maxime Ripard
2022-07-29 18:12 ` Mateusz Kwiatkowski
2022-08-16 11:57 ` Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 21/35] drm/vc4: vec: Fix definition of PAL-M mode Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 22/35] drm/vc4: vec: Use TV Reset implementation Maxime Ripard
2022-07-30 3:03 ` kernel test robot
2022-07-29 16:35 ` [PATCH v1 23/35] drm/vc4: vec: Convert to the new TV mode property Maxime Ripard
2022-08-20 17:22 ` Noralf Trønnes
2022-08-24 15:26 ` Maxime Ripard
2022-08-25 13:14 ` Noralf Trønnes
2022-08-29 12:13 ` Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 24/35] drm/vc4: vec: Add support for more analog TV standards Maxime Ripard
2022-07-29 17:55 ` Mateusz Kwiatkowski
2022-08-15 8:37 ` Maxime Ripard
2022-08-24 16:59 ` Mateusz Kwiatkowski
2022-07-29 16:35 ` [PATCH v1 25/35] drm/sun4i: tv: Remove unused mode_valid Maxime Ripard
2022-07-30 9:13 ` Jernej Škrabec
2022-07-29 16:35 ` [PATCH v1 26/35] drm/sun4i: tv: Convert to atomic hooks Maxime Ripard
2022-07-30 9:12 ` Jernej Škrabec
2022-07-29 16:35 ` [PATCH v1 27/35] drm/sun4i: tv: Merge mode_set into atomic_enable Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 28/35] drm/sun4i: tv: Remove useless function Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 29/35] drm/sun4i: tv: Remove useless destroy function Maxime Ripard
2022-07-30 9:14 ` Jernej Škrabec
2022-07-29 16:35 ` [PATCH v1 30/35] drm/sun4i: tv: Rename error label Maxime Ripard
2022-07-30 9:15 ` Jernej Škrabec
2022-07-29 16:35 ` [PATCH v1 31/35] drm/sun4i: tv: Add missing reset assertion Maxime Ripard
2022-07-30 9:16 ` Jernej Škrabec
2022-07-29 16:35 ` Maxime Ripard [this message]
2022-08-28 17:12 ` [PATCH v1 32/35] drm/sun4i: tv: Convert to the new TV mode property Noralf Trønnes
2022-07-29 16:35 ` [PATCH v1 33/35] drm/connector: Remove TV modes property Maxime Ripard
2022-07-29 20:06 ` kernel test robot
2022-07-29 20:16 ` kernel test robot
2022-07-29 16:35 ` [PATCH v1 34/35] drm/modes: Introduce the tv_mode property as a command-line option Maxime Ripard
2022-08-12 13:31 ` Geert Uytterhoeven
2022-08-16 13:51 ` Maxime Ripard
2022-08-20 20:18 ` Noralf Trønnes
2022-08-24 15:45 ` Maxime Ripard
2022-08-24 17:08 ` Mateusz Kwiatkowski
2022-08-25 12:41 ` Noralf Trønnes
2022-08-26 6:46 ` Maxime Ripard
2022-08-28 17:06 ` Noralf Trønnes
2022-07-29 16:35 ` [PATCH v1 35/35] drm/modes: Introduce more named modes Maxime Ripard
2022-08-21 16:16 ` Noralf Trønnes
2022-08-25 14:22 ` Maxime Ripard
2022-08-08 13:03 ` [PATCH v1 00/35] drm: Analog TV Improvements Noralf Trønnes
2022-08-21 16:33 ` Noralf Trønnes
2022-08-22 7:48 ` Maxime Ripard
2022-08-22 8:57 ` Mateusz Kwiatkowski
2022-08-25 15:55 ` Maxime Ripard
2022-08-25 16:17 ` Mateusz Kwiatkowski
2022-08-26 4:07 ` Mateusz Kwiatkowski
2022-08-26 8:39 ` Maxime Ripard
2022-08-26 14:56 ` Dom Cobley
2022-08-27 16:11 ` Noralf Trønnes
2022-08-30 21:31 ` kFYatek
2022-08-22 13:21 ` Noralf Trønnes
2022-08-25 16:21 ` Maxime Ripard
2022-08-25 19:36 ` 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-v1-32-3d53ae722097@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--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=jbrunet@baylibre.com \
--cc=jernej.skrabec@gmail.com \
--cc=kfyatek+publicgit@gmail.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=martin.blumenstingl@googlemail.com \
--cc=mripard@kernel.org \
--cc=narmstrong@baylibre.com \
--cc=noralf@tronnes.org \
--cc=p.zabel@pengutronix.de \
--cc=phil@raspberrypi.com \
--cc=samuel@sholland.org \
--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).