For nouveau: Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx> On Thu, 2022-09-22 at 16:25 +0200, Maxime Ripard wrote: > drm_mode_create_tv_properties(), among other things, will create the > "mode" property that stores the analog TV mode that connector is > supposed to output. > > However, that property is getting deprecated, so let's rename that > function to mention it's deprecated. We'll introduce a new variant of > that function creating the property superseeding it in a later patch. > > Signed-off-by: Maxime Ripard <maxime@xxxxxxxxxx> > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > index 17a5913cefe3..4e4fbc9e0049 100644 > --- a/drivers/gpu/drm/drm_connector.c > +++ b/drivers/gpu/drm/drm_connector.c > @@ -1600,7 +1600,7 @@ EXPORT_SYMBOL(drm_connector_attach_tv_margin_properties); > * Called by a driver's HDMI connector initialization routine, this function > * creates the TV margin properties for a given device. No need to call this > * function for an SDTV connector, it's already called from > - * drm_mode_create_tv_properties(). > + * drm_mode_create_tv_properties_legacy(). > * > * Returns: > * 0 on success or a negative error code on failure. > @@ -1635,7 +1635,7 @@ int drm_mode_create_tv_margin_properties(struct drm_device *dev) > EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); > > /** > - * drm_mode_create_tv_properties - create TV specific connector properties > + * drm_mode_create_tv_properties_legacy - create TV specific connector properties > * @dev: DRM device > * @num_modes: number of different TV formats (modes) supported > * @modes: array of pointers to strings containing name of each format > @@ -1648,9 +1648,9 @@ EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); > * Returns: > * 0 on success or a negative error code on failure. > */ > -int drm_mode_create_tv_properties(struct drm_device *dev, > - unsigned int num_modes, > - const char * const modes[]) > +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, > + unsigned int num_modes, > + const char * const modes[]) > { > struct drm_property *tv_selector; > struct drm_property *tv_subconnector; > @@ -1733,7 +1733,7 @@ int drm_mode_create_tv_properties(struct drm_device *dev, > nomem: > return -ENOMEM; > } > -EXPORT_SYMBOL(drm_mode_create_tv_properties); > +EXPORT_SYMBOL(drm_mode_create_tv_properties_legacy); > > /** > * drm_mode_create_scaling_mode_property - create scaling mode property > diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_connector.c > index 86e992b2108b..034e78360d4f 100644 > --- a/drivers/gpu/drm/gud/gud_connector.c > +++ b/drivers/gpu/drm/gud/gud_connector.c > @@ -400,7 +400,7 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect > for (i = 0; i < num_modes; i++) > modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN]; > > - ret = drm_mode_create_tv_properties(connector->dev, num_modes, modes); > + ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes); > free: > kfree(buf); > if (ret < 0) > @@ -539,7 +539,7 @@ static int gud_connector_add_properties(struct gud_device *gdrm, struct gud_conn > fallthrough; > case GUD_PROPERTY_TV_HUE: > /* This is a no-op if already added. */ > - ret = drm_mode_create_tv_properties(drm, 0, NULL); > + ret = drm_mode_create_tv_properties_legacy(drm, 0, NULL); > if (ret) > goto out; > break; > diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c > index d29b63fd6178..506f6f932518 100644 > --- a/drivers/gpu/drm/i2c/ch7006_drv.c > +++ b/drivers/gpu/drm/i2c/ch7006_drv.c > @@ -250,7 +250,7 @@ static int ch7006_encoder_create_resources(struct drm_encoder *encoder, > struct drm_device *dev = encoder->dev; > struct drm_mode_config *conf = &dev->mode_config; > > - drm_mode_create_tv_properties(dev, NUM_TV_NORMS, ch7006_tv_norm_names); > + drm_mode_create_tv_properties_legacy(dev, NUM_TV_NORMS, ch7006_tv_norm_names); > > priv->scale_property = drm_property_create_range(dev, 0, "scale", 0, 2); > if (!priv->scale_property) > diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c > index abaf9ded942d..5e88da8185ee 100644 > --- a/drivers/gpu/drm/i915/display/intel_tv.c > +++ b/drivers/gpu/drm/i915/display/intel_tv.c > @@ -1984,7 +1984,7 @@ intel_tv_init(struct drm_i915_private *dev_priv) > > tv_format_names[i] = tv_modes[i].name; > } > - drm_mode_create_tv_properties(dev, i, tv_format_names); > + drm_mode_create_tv_properties_legacy(dev, i, tv_format_names); > > drm_object_attach_property(&connector->base, > dev->mode_config.legacy_tv_mode_property, > diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c > index 1a15534adc60..e5480dab55e3 100644 > --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c > +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c > @@ -653,7 +653,7 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder, > tv_enc->tv_norm = i; > } > > - drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); > + drm_mode_create_tv_properties_legacy(dev, num_tv_norms, nv17_tv_norm_names); > > drm_object_attach_property(&connector->base, > conf->tv_select_subconnector_property, > diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c > index 77c50ecb0309..f31fef938f11 100644 > --- a/drivers/gpu/drm/vc4/vc4_vec.c > +++ b/drivers/gpu/drm/vc4/vc4_vec.c > @@ -514,8 +514,9 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data) > struct vc4_vec *vec; > int ret; > > - ret = drm_mode_create_tv_properties(drm, ARRAY_SIZE(tv_mode_names), > - tv_mode_names); > + ret = drm_mode_create_tv_properties_legacy(drm, > + ARRAY_SIZE(tv_mode_names), > + tv_mode_names); > if (ret) > return ret; > > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 5cfad8b6ad83..d566b4a4709c 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -1799,9 +1799,9 @@ int drm_mode_create_dvi_i_properties(struct drm_device *dev); > void drm_connector_attach_dp_subconnector_property(struct drm_connector *connector); > > int drm_mode_create_tv_margin_properties(struct drm_device *dev); > -int drm_mode_create_tv_properties(struct drm_device *dev, > - unsigned int num_modes, > - const char * const modes[]); > +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, > + unsigned int num_modes, > + const char * const modes[]); > void drm_connector_attach_tv_margin_properties(struct drm_connector *conn); > int drm_mode_create_scaling_mode_property(struct drm_device *dev); > int drm_connector_attach_content_type_property(struct drm_connector *dev); > -- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat