Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c555f023 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: drop _mode_ from update_edit_property() 



Just makes it longer, and for most things in drm_connector.[hc] we
just use the drm_connector_ prefix. Done with sed + a bit of manual
fixup for the indenting.

Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180709084016.23750-6-daniel.vetter@ffwll.ch
parent 92e1d263

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

+2 −2
Original line number Diff line number Diff line
@@ -334,11 +334,11 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector) 
	int ret;



	if (amdgpu_connector->edid) {

		drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid);

		drm_connector_update_edid_property(connector, amdgpu_connector->edid);

		ret = drm_add_edid_modes(connector, amdgpu_connector->edid);

		return ret;

	}

	drm_mode_connector_update_edid_property(connector, NULL);

	drm_connector_update_edid_property(connector, NULL);

	return 0;

}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −2
Original line number Diff line number Diff line
@@ -900,14 +900,14 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector) 
				(struct edid *) sink->dc_edid.raw_edid;





			drm_mode_connector_update_edid_property(connector,

			drm_connector_update_edid_property(connector,

					aconnector->edid);

		}

		amdgpu_dm_add_sink_to_freesync_module(connector, aconnector->edid);



	} else {

		amdgpu_dm_remove_sink_from_freesync_module(connector);

		drm_mode_connector_update_edid_property(connector, NULL);

		drm_connector_update_edid_property(connector, NULL);

		aconnector->num_modes = 0;

		aconnector->dc_sink = NULL;

		aconnector->edid = NULL;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+2 −2
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) 
		edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);



		if (!edid) {

			drm_mode_connector_update_edid_property(

			drm_connector_update_edid_property(

				&aconnector->base,

				NULL);

			return ret;
@@ -261,7 +261,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) 
					connector, aconnector->edid);

	}



	drm_mode_connector_update_edid_property(

	drm_connector_update_edid_property(

					&aconnector->base, aconnector->edid);



	ret = drm_add_edid_modes(connector, aconnector->edid);

drivers/gpu/drm/ast/ast_mode.c

+2 −2
Original line number Diff line number Diff line
@@ -790,12 +790,12 @@ static int ast_get_modes(struct drm_connector *connector) 
	if (!flags)

		edid = drm_get_edid(connector, &ast_connector->i2c->adapter);

	if (edid) {

		drm_mode_connector_update_edid_property(&ast_connector->base, edid);

		drm_connector_update_edid_property(&ast_connector->base, edid);

		ret = drm_add_edid_modes(connector, edid);

		kfree(edid);

		return ret;

	} else

		drm_mode_connector_update_edid_property(&ast_connector->base, NULL);

		drm_connector_update_edid_property(&ast_connector->base, NULL);

	return 0;

}

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ static int adv7511_get_modes(struct adv7511 *adv7511, 
		__adv7511_power_off(adv7511);





	drm_mode_connector_update_edid_property(connector, edid);

	drm_connector_update_edid_property(connector, edid);

	count = drm_add_edid_modes(connector, edid);



	adv7511_set_config_csc(adv7511, connector, adv7511->rgb,