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

Commit 3a5f4a21 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: adjust eDP handling (v2) 



eDP is usually used as an LVDS replacement, so treat
it more like LVDS from the user perspective.

v2: encoder mode is always DP for eDP.

Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 86a94def

drivers/gpu/drm/radeon/radeon_connectors.c

+25 −5
Original line number Diff line number Diff line
@@ -1314,7 +1314,6 @@ radeon_add_atom_connector(struct drm_device *dev, 
			connector->doublescan_allowed = false;

		break;

	case DRM_MODE_CONNECTOR_DisplayPort:

	case DRM_MODE_CONNECTOR_eDP:

		radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL);

		if (!radeon_dig_connector)

			goto failed;
@@ -1324,9 +1323,6 @@ radeon_add_atom_connector(struct drm_device *dev, 
		drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);

		if (i2c_bus->valid) {

			/* add DP i2c bus */

			if (connector_type == DRM_MODE_CONNECTOR_eDP)

				radeon_dig_connector->dp_i2c_bus = radeon_i2c_create_dp(dev, i2c_bus, "eDP-auxch");

			else

			radeon_dig_connector->dp_i2c_bus = radeon_i2c_create_dp(dev, i2c_bus, "DP-auxch");

			if (!radeon_dig_connector->dp_i2c_bus)

				DRM_ERROR("DP: Failed to assign dp ddc bus! Check dmesg for i2c errors.\n");
@@ -1353,6 +1349,30 @@ radeon_add_atom_connector(struct drm_device *dev, 
		/* in theory with a DP to VGA converter... */

		connector->doublescan_allowed = false;

		break;

	case DRM_MODE_CONNECTOR_eDP:

		radeon_dig_connector = kzalloc(sizeof(struct radeon_connector_atom_dig), GFP_KERNEL);

		if (!radeon_dig_connector)

			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) {

			/* add DP i2c bus */

			radeon_dig_connector->dp_i2c_bus = radeon_i2c_create_dp(dev, i2c_bus, "eDP-auxch");

			if (!radeon_dig_connector->dp_i2c_bus)

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

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

			if (!radeon_connector->ddc_bus)

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

		}

		drm_connector_attach_property(&radeon_connector->base,

					      dev->mode_config.scaling_mode_property,

					      DRM_MODE_SCALE_FULLSCREEN);

		subpixel_order = SubPixelHorizontalRGB;

		connector->interlace_allowed = false;

		connector->doublescan_allowed = false;

		break;

	case DRM_MODE_CONNECTOR_SVIDEO:

	case DRM_MODE_CONNECTOR_Composite:

	case DRM_MODE_CONNECTOR_9PinDIN:

drivers/gpu/drm/radeon/radeon_encoders.c

+2 −1
Original line number Diff line number Diff line
@@ -668,7 +668,6 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
		return ATOM_ENCODER_MODE_LVDS;

		break;

	case DRM_MODE_CONNECTOR_DisplayPort:

	case DRM_MODE_CONNECTOR_eDP:

		dig_connector = radeon_connector->con_priv;

		if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||

		    (dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_eDP))
@@ -682,6 +681,8 @@ atombios_get_encoder_mode(struct drm_encoder *encoder) 
		} else

			return ATOM_ENCODER_MODE_DVI;

		break;

	case DRM_MODE_CONNECTOR_eDP:

		return ATOM_ENCODER_MODE_DP;

	case DRM_MODE_CONNECTOR_DVIA:

	case DRM_MODE_CONNECTOR_VGA:

		return ATOM_ENCODER_MODE_CRT;