Unverified Commit 1fd4a5a3 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/connector: Rename legacy TV property 



The current tv_mode has driver-specific values that don't allow to
easily share code using it, either at the userspace or kernel level.

Since we're going to introduce a new, generic, property that fit the
same purpose, let's rename this one to legacy_tv_mode to make it
obvious we should move away from it.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Lyude Paul <lyude@redhat.com> # nouveau
Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Tested-by: default avatarMateusz Kwiatkowski <kfyatek+publicgit@gmail.com>
Acked-in-principle-or-something-like-that-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://lore.kernel.org/r/20220728-rpi-analog-tv-properties-v10-2-256dad125326@cerno.tech


Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
parent e76c4156

drivers/gpu/drm/drm_atomic_uapi.c

+4 −4
Original line number Diff line number Diff line
@@ -698,8 +698,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, 
		state->tv.margins.top = val;

	} else if (property == config->tv_bottom_margin_property) {

		state->tv.margins.bottom = val;

	} else if (property == config->tv_mode_property) {

		state->tv.mode = val;

	} else if (property == config->legacy_tv_mode_property) {

		state->tv.legacy_mode = val;

	} else if (property == config->tv_brightness_property) {

		state->tv.brightness = val;

	} else if (property == config->tv_contrast_property) {
@@ -808,8 +808,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, 
		*val = state->tv.margins.top;

	} else if (property == config->tv_bottom_margin_property) {

		*val = state->tv.margins.bottom;

	} else if (property == config->tv_mode_property) {

		*val = state->tv.mode;

	} else if (property == config->legacy_tv_mode_property) {

		*val = state->tv.legacy_mode;

	} else if (property == config->tv_brightness_property) {

		*val = state->tv.brightness;

	} else if (property == config->tv_contrast_property) {

drivers/gpu/drm/drm_connector.c

+3 −3
Original line number Diff line number Diff line
@@ -1690,14 +1690,14 @@ int drm_mode_create_tv_properties(struct drm_device *dev, 
	if (drm_mode_create_tv_margin_properties(dev))

		goto nomem;



	dev->mode_config.tv_mode_property =

	dev->mode_config.legacy_tv_mode_property =

		drm_property_create(dev, DRM_MODE_PROP_ENUM,

				    "mode", num_modes);

	if (!dev->mode_config.tv_mode_property)

	if (!dev->mode_config.legacy_tv_mode_property)

		goto nomem;



	for (i = 0; i < num_modes; i++)

		drm_property_add_enum(dev->mode_config.tv_mode_property,

		drm_property_add_enum(dev->mode_config.legacy_tv_mode_property,

				      i, modes[i]);



	dev->mode_config.tv_brightness_property =

drivers/gpu/drm/gud/gud_connector.c

+3 −3
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static int gud_connector_atomic_check(struct drm_connector *connector, 
	    old_state->tv.margins.right != new_state->tv.margins.right ||

	    old_state->tv.margins.top != new_state->tv.margins.top ||

	    old_state->tv.margins.bottom != new_state->tv.margins.bottom ||

	    old_state->tv.mode != new_state->tv.mode ||

	    old_state->tv.legacy_mode != new_state->tv.legacy_mode ||

	    old_state->tv.brightness != new_state->tv.brightness ||

	    old_state->tv.contrast != new_state->tv.contrast ||

	    old_state->tv.flicker_reduction != new_state->tv.flicker_reduction ||
@@ -424,7 +424,7 @@ gud_connector_property_lookup(struct drm_connector *connector, u16 prop) 
	case GUD_PROPERTY_TV_BOTTOM_MARGIN:

		return config->tv_bottom_margin_property;

	case GUD_PROPERTY_TV_MODE:

		return config->tv_mode_property;

		return config->legacy_tv_mode_property;

	case GUD_PROPERTY_TV_BRIGHTNESS:

		return config->tv_brightness_property;

	case GUD_PROPERTY_TV_CONTRAST:
@@ -454,7 +454,7 @@ static unsigned int *gud_connector_tv_state_val(u16 prop, struct drm_tv_connecto 
	case GUD_PROPERTY_TV_BOTTOM_MARGIN:

		return &state->margins.bottom;

	case GUD_PROPERTY_TV_MODE:

		return &state->mode;

		return &state->legacy_mode;

	case GUD_PROPERTY_TV_BRIGHTNESS:

		return &state->brightness;

	case GUD_PROPERTY_TV_CONTRAST:

drivers/gpu/drm/i2c/ch7006_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int ch7006_encoder_create_resources(struct drm_encoder *encoder, 
				      priv->hmargin);

	drm_object_attach_property(&connector->base, conf->tv_bottom_margin_property,

				      priv->vmargin);

	drm_object_attach_property(&connector->base, conf->tv_mode_property,

	drm_object_attach_property(&connector->base, conf->legacy_tv_mode_property,

				   priv->norm);

	drm_object_attach_property(&connector->base, conf->tv_brightness_property,

				      priv->brightness);
@@ -315,7 +315,7 @@ static int ch7006_encoder_set_property(struct drm_encoder *encoder, 
		ch7006_load_reg(client, state, CH7006_POV);

		ch7006_load_reg(client, state, CH7006_VPOS);



	} else if (property == conf->tv_mode_property) {

	} else if (property == conf->legacy_tv_mode_property) {

		if (connector->dpms != DRM_MODE_DPMS_OFF)

			return -EINVAL;

drivers/gpu/drm/i915/display/intel_tv.c

+1 −1
Original line number Diff line number Diff line
@@ -1908,7 +1908,7 @@ static void intel_tv_add_properties(struct drm_connector *connector) 
	drm_mode_create_tv_properties(&i915->drm, i, tv_format_names);



	drm_object_attach_property(&connector->base,

				   i915->drm.mode_config.tv_mode_property,

				   i915->drm.mode_config.legacy_tv_mode_property,

				   conn_state->tv.mode);

	drm_object_attach_property(&connector->base,

				   i915->drm.mode_config.tv_left_margin_property,