Unverified Commit d0236008 authored Sep 29, 2022 by Maxime Ripard

drm/connector: Rename subconnector state variable



There is two TV subconnector related properties registered by
drm_mode_create_tv_properties(): subconnector and select subconnector.

While the select subconnector property is stored in the kernel by the
drm_tv_connector_state structure, the subconnector property isn't stored
anywhere.

Worse, the select subconnector property is stored in a field called
subconnector, creating some ambiguity about which property content we're
accessing.

Let's rename that field to one called select_subconnector to make it move
obvious what it's about.

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Link: https://lore.kernel.org/r/20220728-rpi-analog-tv-properties-v4-5-60d38873f782@cerno.tech


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

parent 05e70e32

drivers/gpu/drm/drm_atomic_uapi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -687,7 +687,7 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
		*/
		return -EINVAL;
		} else if (property == config->tv_select_subconnector_property) {
		state->tv.subconnector = val;
		state->tv.select_subconnector = val;
		} else if (property == config->tv_left_margin_property) {
		state->tv.margins.left = val;
		} else if (property == config->tv_right_margin_property) {
		@@ -795,7 +795,7 @@ drm_atomic_connector_get_property(struct drm_connector *connector,
		else
		*val = connector->dpms;
		} else if (property == config->tv_select_subconnector_property) {
		*val = state->tv.subconnector;
		*val = state->tv.select_subconnector;
		} else if (property == config->tv_left_margin_property) {
		*val = state->tv.margins.left;
		} else if (property == config->tv_right_margin_property) {

include/drm/drm_connector.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -692,7 +692,7 @@ struct drm_connector_tv_margins {

		/**
		* struct drm_tv_connector_state - TV connector related states
		* @subconnector: selected subconnector
		* @select_subconnector: selected subconnector
		* @margins: TV margins
		* @mode: TV mode
		* @brightness: brightness in percent
		@@ -703,7 +703,7 @@ struct drm_connector_tv_margins {
		* @hue: hue in percent
		*/
		struct drm_tv_connector_state {
		enum drm_mode_subconnector subconnector;
		enum drm_mode_subconnector select_subconnector;
		struct drm_connector_tv_margins margins;
		unsigned int mode;
		unsigned int brightness;