Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i8771445c:Fastmail
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>,
        =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <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 07/41] drm/connector: Only register TV mode property if present
Date:   Mon, 29 Aug 2022 15:11:21 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-7-459522d653a7@cerno.tech>
In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech>
References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The drm_create_tv_properties() will create the TV mode property=0D
unconditionally.=0D
=0D
However, since we'll gradually phase it out, let's register it only if we=0D
have a list passed as an argument. This will make the transition easier.=0D
=0D
Signed-off-by: Maxime Ripard <maxime@cerno.tech>=0D
Acked-by: Noralf Tr=C3=B8nnes <noralf@tronnes.org>=0D
=0D
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto=
r.c=0D
index ede6025638d7..17a5913cefe3 100644=0D
--- a/drivers/gpu/drm/drm_connector.c=0D
+++ b/drivers/gpu/drm/drm_connector.c=0D
@@ -1686,15 +1686,18 @@ int drm_mode_create_tv_properties(struct drm_device=
 *dev,=0D
 	if (drm_mode_create_tv_margin_properties(dev))=0D
 		goto nomem;=0D
 =0D
-	dev->mode_config.legacy_tv_mode_property =3D=0D
-		drm_property_create(dev, DRM_MODE_PROP_ENUM,=0D
-				    "mode", num_modes);=0D
-	if (!dev->mode_config.legacy_tv_mode_property)=0D
-		goto nomem;=0D
 =0D
-	for (i =3D 0; i < num_modes; i++)=0D
-		drm_property_add_enum(dev->mode_config.legacy_tv_mode_property,=0D
-				      i, modes[i]);=0D
+	if (num_modes) {=0D
+		dev->mode_config.legacy_tv_mode_property =3D=0D
+			drm_property_create(dev, DRM_MODE_PROP_ENUM,=0D
+					    "mode", num_modes);=0D
+		if (!dev->mode_config.legacy_tv_mode_property)=0D
+			goto nomem;=0D
+=0D
+		for (i =3D 0; i < num_modes; i++)=0D
+			drm_property_add_enum(dev->mode_config.legacy_tv_mode_property,=0D
+					      i, modes[i]);=0D
+	}=0D
 =0D
 	dev->mode_config.tv_brightness_property =3D=0D
 		drm_property_create_range(dev, 0, "brightness", 0, 100);=0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D