The drm_create_tv_properties() will create the TV mode property
unconditionally.

However, since we'll gradually phase it out, let's register it only if we
have a list passed as an argument. This will make the transition easier.

Acked-by: Noralf Trønnes <nor...@tronnes.org>
Signed-off-by: Maxime Ripard <max...@cerno.tech>
---
 drivers/gpu/drm/drm_connector.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index ede6025638d7..17a5913cefe3 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -1686,15 +1686,18 @@ int drm_mode_create_tv_properties(struct drm_device 
*dev,
        if (drm_mode_create_tv_margin_properties(dev))
                goto nomem;
 
-       dev->mode_config.legacy_tv_mode_property =
-               drm_property_create(dev, DRM_MODE_PROP_ENUM,
-                                   "mode", num_modes);
-       if (!dev->mode_config.legacy_tv_mode_property)
-               goto nomem;
 
-       for (i = 0; i < num_modes; i++)
-               drm_property_add_enum(dev->mode_config.legacy_tv_mode_property,
-                                     i, modes[i]);
+       if (num_modes) {
+               dev->mode_config.legacy_tv_mode_property =
+                       drm_property_create(dev, DRM_MODE_PROP_ENUM,
+                                           "mode", num_modes);
+               if (!dev->mode_config.legacy_tv_mode_property)
+                       goto nomem;
+
+               for (i = 0; i < num_modes; i++)
+                       
drm_property_add_enum(dev->mode_config.legacy_tv_mode_property,
+                                             i, modes[i]);
+       }
 
        dev->mode_config.tv_brightness_property =
                drm_property_create_range(dev, 0, "brightness", 0, 100);

-- 
b4 0.11.0-dev-99e3a

Reply via email to