Commit 93386368 authored by Neil Armstrong's avatar Neil Armstrong
Browse files

Revert "drm/radeon: Provide ddc symlink in connector sysfs directory" 



This reverts commit bed7a218.

It causes the following build error:
../drm/radeon/radeon_connectors.c: In function 'radeon_add_legacy_connector':
../drm/radeon/radeon_connectors.c:2433:5: error: 'ddc' undeclared (first use in this function)
     ddc = &radeon_connector->ddc_bus->adapter;
     ^~~

Suggested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190801115313.22562-1-narmstrong@baylibre.com
parent bed7a218

drivers/gpu/drm/radeon/radeon_connectors.c

+36 −106
Original line number Diff line number Diff line
@@ -1870,7 +1870,6 @@ radeon_add_atom_connector(struct drm_device *dev, 
	struct radeon_connector_atom_dig *radeon_dig_connector;

	struct drm_encoder *encoder;

	struct radeon_encoder *radeon_encoder;

	struct i2c_adapter *ddc;

	uint32_t subpixel_order = SubPixelNone;

	bool shared_ddc = false;

	bool is_dp_bridge = false;
@@ -1948,21 +1947,17 @@ radeon_add_atom_connector(struct drm_device *dev, 
		radeon_connector->con_priv = radeon_dig_connector;

		if (i2c_bus->valid) {

			radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

			if (radeon_connector->ddc_bus) {

			if (radeon_connector->ddc_bus)

				has_aux = true;

				ddc = &radeon_connector->ddc_bus->adapter;

			} else {

			else

				DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

		}

		}

		switch (connector_type) {

		case DRM_MODE_CONNECTOR_VGA:

		case DRM_MODE_CONNECTOR_DVIA:

		default:

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_dp_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_init(dev, &radeon_connector->base,

					   &radeon_dp_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base,

						 &radeon_dp_connector_helper_funcs);

			connector->interlace_allowed = true;
@@ -1984,10 +1979,8 @@ radeon_add_atom_connector(struct drm_device *dev, 
		case DRM_MODE_CONNECTOR_HDMIA:

		case DRM_MODE_CONNECTOR_HDMIB:

		case DRM_MODE_CONNECTOR_DisplayPort:

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_dp_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_init(dev, &radeon_connector->base,

					   &radeon_dp_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base,

						 &radeon_dp_connector_helper_funcs);

			drm_object_attach_property(&radeon_connector->base.base,
@@ -2034,10 +2027,8 @@ radeon_add_atom_connector(struct drm_device *dev, 
			break;

		case DRM_MODE_CONNECTOR_LVDS:

		case DRM_MODE_CONNECTOR_eDP:

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_lvds_bridge_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_init(dev, &radeon_connector->base,

					   &radeon_lvds_bridge_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base,

						 &radeon_dp_connector_helper_funcs);

			drm_object_attach_property(&radeon_connector->base.base,
@@ -2051,18 +2042,13 @@ radeon_add_atom_connector(struct drm_device *dev, 
	} else {

		switch (connector_type) {

		case DRM_MODE_CONNECTOR_VGA:

			drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);

			if (i2c_bus->valid) {

				radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

				if (!radeon_connector->ddc_bus)

					DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

				else

					ddc = &radeon_connector->ddc_bus->adapter;

			}

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_vga_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);

			radeon_connector->dac_load_detect = true;

			drm_object_attach_property(&radeon_connector->base.base,

						      rdev->mode_info.load_detect_property,
@@ -2081,18 +2067,13 @@ radeon_add_atom_connector(struct drm_device *dev, 
			connector->doublescan_allowed = true;

			break;

		case DRM_MODE_CONNECTOR_DVIA:

			drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);

			if (i2c_bus->valid) {

				radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

				if (!radeon_connector->ddc_bus)

					DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

				else

					ddc = &radeon_connector->ddc_bus->adapter;

			}

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_vga_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);

			radeon_connector->dac_load_detect = true;

			drm_object_attach_property(&radeon_connector->base.base,

						      rdev->mode_info.load_detect_property,
@@ -2117,18 +2098,13 @@ radeon_add_atom_connector(struct drm_device *dev, 
				goto failed;

			radeon_dig_connector->igp_lane_info = igp_lane_info;

			radeon_connector->con_priv = radeon_dig_connector;

			drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);

			if (i2c_bus->valid) {

				radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

				if (!radeon_connector->ddc_bus)

					DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

				else

					ddc = &radeon_connector->ddc_bus->adapter;

			}

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_dvi_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);

			subpixel_order = SubPixelHorizontalRGB;

			drm_object_attach_property(&radeon_connector->base.base,

						      rdev->mode_info.coherent_mode_property,
@@ -2179,18 +2155,13 @@ radeon_add_atom_connector(struct drm_device *dev, 
				goto failed;

			radeon_dig_connector->igp_lane_info = igp_lane_info;

			radeon_connector->con_priv = radeon_dig_connector;

			drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);

			if (i2c_bus->valid) {

				radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

				if (!radeon_connector->ddc_bus)

					DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

				else

					ddc = &radeon_connector->ddc_bus->adapter;

			}

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_dvi_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);

			drm_object_attach_property(&radeon_connector->base.base,

						      rdev->mode_info.coherent_mode_property,

						      1);
@@ -2234,20 +2205,15 @@ radeon_add_atom_connector(struct drm_device *dev, 
				goto failed;

			radeon_dig_connector->igp_lane_info = igp_lane_info;

			radeon_connector->con_priv = radeon_dig_connector;

			drm_connector_init(dev, &radeon_connector->base, &radeon_dp_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);

			if (i2c_bus->valid) {

				radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

				if (radeon_connector->ddc_bus) {

				if (radeon_connector->ddc_bus)

					has_aux = true;

					ddc = &radeon_connector->ddc_bus->adapter;

				} else {

				else

					DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

			}

			}

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_dp_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);

			subpixel_order = SubPixelHorizontalRGB;

			drm_object_attach_property(&radeon_connector->base.base,

						      rdev->mode_info.coherent_mode_property,
@@ -2289,20 +2255,15 @@ radeon_add_atom_connector(struct drm_device *dev, 
				goto failed;

			radeon_dig_connector->igp_lane_info = igp_lane_info;

			radeon_connector->con_priv = radeon_dig_connector;

			drm_connector_init(dev, &radeon_connector->base, &radeon_edp_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);

			if (i2c_bus->valid) {

				radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

				if (radeon_connector->ddc_bus) {

				if (radeon_connector->ddc_bus)

					has_aux = true;

					ddc = &radeon_connector->ddc_bus->adapter;

				} else {

				else

					DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

			}

			}

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_edp_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);

			drm_object_attach_property(&radeon_connector->base.base,

						      dev->mode_config.scaling_mode_property,

						      DRM_MODE_SCALE_FULLSCREEN);
@@ -2313,10 +2274,7 @@ radeon_add_atom_connector(struct drm_device *dev, 
		case DRM_MODE_CONNECTOR_SVIDEO:

		case DRM_MODE_CONNECTOR_Composite:

		case DRM_MODE_CONNECTOR_9PinDIN:

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_tv_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);

			radeon_connector->dac_load_detect = true;

			drm_object_attach_property(&radeon_connector->base.base,
@@ -2336,18 +2294,13 @@ radeon_add_atom_connector(struct drm_device *dev, 
				goto failed;

			radeon_dig_connector->igp_lane_info = igp_lane_info;

			radeon_connector->con_priv = radeon_dig_connector;

			drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);

			drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);

			if (i2c_bus->valid) {

				radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

				if (!radeon_connector->ddc_bus)

					DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

				else

					ddc = &radeon_connector->ddc_bus->adapter;

			}

			drm_connector_init_with_ddc(dev, &radeon_connector->base,

						    &radeon_lvds_connector_funcs,

						    connector_type,

						    ddc);

			drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);

			drm_object_attach_property(&radeon_connector->base.base,

						      dev->mode_config.scaling_mode_property,

						      DRM_MODE_SCALE_FULLSCREEN);
@@ -2425,18 +2378,13 @@ radeon_add_legacy_connector(struct drm_device *dev, 


	switch (connector_type) {

	case DRM_MODE_CONNECTOR_VGA:

		drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);

		drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);

		if (i2c_bus->valid) {

			radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

			if (!radeon_connector->ddc_bus)

				DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

			else

				ddc = &radeon_connector->ddc_bus->adapter;

		}

		drm_connector_init_with_ddc(dev, &radeon_connector->base,

					    &radeon_vga_connector_funcs,

					    connector_type,

					    ddc);

		drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);

		radeon_connector->dac_load_detect = true;

		drm_object_attach_property(&radeon_connector->base.base,

					      rdev->mode_info.load_detect_property,
@@ -2447,18 +2395,13 @@ radeon_add_legacy_connector(struct drm_device *dev, 
		connector->doublescan_allowed = true;

		break;

	case DRM_MODE_CONNECTOR_DVIA:

		drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);

		drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);

		if (i2c_bus->valid) {

			radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

			if (!radeon_connector->ddc_bus)

				DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

			else

				ddc = &radeon_connector->ddc_bus->adapter;

		}

		drm_connector_init_with_ddc(dev, &radeon_connector->base,

					    &radeon_vga_connector_funcs,

					    connector_type,

					    ddc);

		drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);

		radeon_connector->dac_load_detect = true;

		drm_object_attach_property(&radeon_connector->base.base,

					      rdev->mode_info.load_detect_property,
@@ -2470,18 +2413,13 @@ radeon_add_legacy_connector(struct drm_device *dev, 
		break;

	case DRM_MODE_CONNECTOR_DVII:

	case DRM_MODE_CONNECTOR_DVID:

		drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type);

		drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);

		if (i2c_bus->valid) {

			radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

			if (!radeon_connector->ddc_bus)

				DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

			else

				ddc = &radeon_connector->ddc_bus->adapter;

		}

		drm_connector_init_with_ddc(dev, &radeon_connector->base,

					    &radeon_dvi_connector_funcs,

					    connector_type,

					    ddc);

		drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);

		if (connector_type == DRM_MODE_CONNECTOR_DVII) {

			radeon_connector->dac_load_detect = true;

			drm_object_attach_property(&radeon_connector->base.base,
@@ -2498,10 +2436,7 @@ radeon_add_legacy_connector(struct drm_device *dev, 
	case DRM_MODE_CONNECTOR_SVIDEO:

	case DRM_MODE_CONNECTOR_Composite:

	case DRM_MODE_CONNECTOR_9PinDIN:

		drm_connector_init_with_ddc(dev, &radeon_connector->base,

					    &radeon_tv_connector_funcs,

					    connector_type,

					    ddc);

		drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);

		drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);

		radeon_connector->dac_load_detect = true;

		/* RS400,RC410,RS480 chipset seems to report a lot
@@ -2523,18 +2458,13 @@ radeon_add_legacy_connector(struct drm_device *dev, 
		connector->doublescan_allowed = false;

		break;

	case DRM_MODE_CONNECTOR_LVDS:

		drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);

		drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);

		if (i2c_bus->valid) {

			radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);

			if (!radeon_connector->ddc_bus)

				DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");

			else

				ddc = &radeon_connector->ddc_bus->adapter;

		}

		drm_connector_init_with_ddc(dev, &radeon_connector->base,

					    &radeon_lvds_connector_funcs,

					    connector_type,

					    ddc);

		drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);

		drm_object_attach_property(&radeon_connector->base.base,

					      dev->mode_config.scaling_mode_property,

					      DRM_MODE_SCALE_FULLSCREEN);

CRA Git | Maintained and supported by SUSTech CRA and CCSE