[PATCH v1 06/35] drm/connector: Only register TV mode property if present

[Maxime Ripard]

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.

Signed-off-by: Maxime Ripard <max...@cerno.tech>

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 68a4e47f85a9..d73a68764b6e 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -1684,7 +1684,6 @@ int drm_mode_create_tv_properties(struct drm_device *dev,
        struct drm_property *tv_selector;
        struct drm_property *tv_subconnector;
        struct drm_property *tv_norm;
-       unsigned int i;
 
        if (dev->mode_config.tv_select_subconnector_property)
                return 0;
@@ -1723,15 +1722,19 @@ int drm_mode_create_tv_properties(struct drm_device 
*dev,
                goto nomem;
        dev->mode_config.tv_norm_property = tv_norm;
 
-       dev->mode_config.tv_mode_property =
-               drm_property_create(dev, DRM_MODE_PROP_ENUM,
-                                   "mode", num_modes);
-       if (!dev->mode_config.tv_mode_property)
-               goto nomem;
+       if (num_modes) {
+               unsigned int i;
 
-       for (i = 0; i < num_modes; i++)
-               drm_property_add_enum(dev->mode_config.tv_mode_property,
-                                     i, modes[i]);
+               dev->mode_config.tv_mode_property =
+                       drm_property_create(dev, DRM_MODE_PROP_ENUM,
+                                           "mode", num_modes);
+               if (!dev->mode_config.tv_mode_property)
+                       goto nomem;
+
+               for (i = 0; i < num_modes; i++)
+                       drm_property_add_enum(dev->mode_config.tv_mode_property,
+                                             i, modes[i]);
+       }
 
        dev->mode_config.tv_brightness_property =
                drm_property_create_range(dev, 0, "brightness", 0, 100);

-- 
b4 0.10.0-dev-49460