WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/atombios_dp.c

 static char *pre_emph_names[] = {
         "0dB", "3.5dB", "6dB", "9.5dB"
 };
+/***** radeon AUX functions *****/
+/* Atom needs data in little endian format
+ * so swap as appropriate when copying data to
+ * or from atom. Note that atom operates on
+ * dw units.
+ */
+void radeon_atom_copy_swap(u8 *dst, u8 *src, u8 num_bytes, bool to_le)
+{
+#ifdef __BIG_ENDIAN
+	u8 src_tmp[20], dst_tmp[20]; /* used for byteswapping */
+	u32 *dst32, *src32;
+	int i;
+	memcpy(src_tmp, src, num_bytes);
+	src32 = (u32 *)src_tmp;
+	dst32 = (u32 *)dst_tmp;
+	if (to_le) {
+		for (i = 0; i < ((num_bytes + 3) / 4); i++)
+			dst32[i] = cpu_to_le32(src32[i]);
+		memcpy(dst, dst_tmp, num_bytes);
+	} else {
+		u8 dws = num_bytes & ~3;
+		for (i = 0; i < ((num_bytes + 3) / 4); i++)
+			dst32[i] = le32_to_cpu(src32[i]);
+		memcpy(dst, dst_tmp, dws);
+		if (num_bytes % 4) {
+			for (i = 0; i < (num_bytes % 4); i++)
+				dst[dws+i] = dst_tmp[dws+i];
+		}
+	}
+#else
+	memcpy(dst, src, num_bytes);
+#endif
+}
 /***** radeon AUX functions *****/
 union aux_channel_transaction {
 	PROCESS_AUX_CHANNEL_TRANSACTION_PS_ALLOCATION v1;
 	PROCESS_AUX_CHANNEL_TRANSACTION_PARAMETERS_V2 v2;
 	struct radeon_device *rdev = dev->dev_private;
 	union aux_channel_transaction args;
 	int index = GetIndexIntoMasterTable(COMMAND, ProcessAuxChannelTransaction);
 	unsigned char *base;
 	int recv_bytes;
+	int r = 0;
+	memset(&args, 0, sizeof(args));
-	memset(&args, 0, sizeof(args));
+	mutex_lock(&chan->mutex);
 	base = (unsigned char *)(rdev->mode_info.atom_context->scratch + 1);
-	memcpy(base, send, send_bytes);
+	radeon_atom_copy_swap(base, send, send_bytes, true);
-	args.v1.lpAuxRequest = 0 + 4;
+	args.v1.lpAuxRequest = cpu_to_le16((u16)(0 + 4));
-	args.v1.lpDataOut = 16 + 4;
+	args.v1.lpDataOut = cpu_to_le16((u16)(16 + 4));
 	args.v1.ucDataOutLen = 0;
 	*ack = args.v1.ucReplyStatus;
 	/* timeout */
 	if (args.v1.ucReplyStatus == 1) {
 		DRM_DEBUG_KMS("dp_aux_ch timeout\n");
+		r = -ETIMEDOUT;
-		return -ETIMEDOUT;
+		goto done;
+			}
 	/* flags not zero */
 	if (args.v1.ucReplyStatus == 2) {
+		DRM_DEBUG_KMS("dp_aux_ch flags not zero\n");
-		DRM_DEBUG_KMS("dp_aux_ch flags not zero\n");
+		r = -EIO;
-		return -EBUSY;
+		goto done;
+			}
 	/* error */
+	if (args.v1.ucReplyStatus == 3) {
-	if (args.v1.ucReplyStatus == 3) {
+		DRM_DEBUG_KMS("dp_aux_ch error\n");
-		DRM_DEBUG_KMS("dp_aux_ch error\n");
+		r = -EIO;
-		return -EIO;
+		goto done;
+		}
 	recv_bytes = args.v1.ucDataOutLen;
 	if (recv_bytes > recv_size)
-		recv_bytes = recv_size;
-	if (recv && recv_size)
-		memcpy(recv, base + 16, recv_bytes);
-	return recv_bytes;
-}
+		recv_bytes = recv_size;
-static int radeon_dp_aux_native_write(struct radeon_connector *radeon_connector,
-				      u16 address, u8 *send, u8 send_bytes, u8 delay)
-{
-	struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;
-	int ret;
-	u8 msg[20];
-	int msg_bytes = send_bytes + 4;
-	u8 ack;
-	unsigned retry;
-	if (send_bytes > 16)
-		return -1;
-	msg[0] = address;
-	msg[1] = address >> 8;
-	msg[2] = AUX_NATIVE_WRITE << 4;
-	msg[3] = (msg_bytes << 4) | (send_bytes - 1);
-	memcpy(&msg[4], send, send_bytes);
+	if (recv && recv_size)
-	for (retry = 0; retry < 4; retry++) {
-		ret = radeon_process_aux_ch(dig_connector->dp_i2c_bus,
-					    msg, msg_bytes, NULL, 0, delay, &ack);
-		if (ret == -EBUSY)
-			continue;
-		else if (ret < 0)
-			return ret;
+		radeon_atom_copy_swap(recv, base + 16, recv_bytes, false);
-		if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_ACK)
-			return send_bytes;
+	r = recv_bytes;
-		else if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_DEFER)
+done:
-			udelay(400);
+	mutex_unlock(&chan->mutex);
 		else
-			return -EIO;
+	return r;
-			}
+}
-	return -EIO;
+#define BARE_ADDRESS_SIZE 3
-static int radeon_dp_aux_native_read(struct radeon_connector *radeon_connector,
-				     u16 address, u8 *recv, int recv_bytes, u8 delay)
+#define HEADER_SIZE (BARE_ADDRESS_SIZE + 1)
-{
-	struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;
-	u8 msg[4];
-	int msg_bytes = 4;
+static ssize_t
-	u8 ack;
-	int ret;
-	unsigned retry;
+radeon_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
-	msg[0] = address;
-	msg[1] = address >> 8;
-	msg[2] = AUX_NATIVE_READ << 4;
-	msg[3] = (msg_bytes << 4) | (recv_bytes - 1);
-	for (retry = 0; retry < 4; retry++) {
-		ret = radeon_process_aux_ch(dig_connector->dp_i2c_bus,
-					    msg, msg_bytes, recv, recv_bytes, delay, &ack);
-		if (ret == -EBUSY)
-			continue;
-		else if (ret < 0)
+{
-			return ret;
-		if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_ACK)
+	struct radeon_i2c_chan *chan =
-			return ret;
+		container_of(aux, struct radeon_i2c_chan, aux);
-		else if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_DEFER)
-			udelay(400);
-		else if (ret == 0)
+	int ret;
-			return -EPROTO;
+	u8 tx_buf[20];
-				else
-			return -EIO;
+	size_t tx_size;
-			}
+	u8 ack, delay = 0;
-	return -EIO;
-}
+	if (WARN_ON(msg->size > 16))
-static void radeon_write_dpcd_reg(struct radeon_connector *radeon_connector,
-				 u16 reg, u8 val)
-{
-	radeon_dp_aux_native_write(radeon_connector, reg, &val, 1, 0);
-}
+		return -E2BIG;
-static u8 radeon_read_dpcd_reg(struct radeon_connector *radeon_connector,
-			       u16 reg)
-{
+	tx_buf[0] = msg->address & 0xff;
-	u8 val = 0;
+	tx_buf[1] = msg->address >> 8;
+	tx_buf[2] = msg->request << 4;
-	radeon_dp_aux_native_read(radeon_connector, reg, &val, 1, 0);
+	tx_buf[3] = msg->size ? (msg->size - 1) : 0;
-	return val;
+	switch (msg->request & ~DP_AUX_I2C_MOT) {
-}
+	case DP_AUX_NATIVE_WRITE:
+	case DP_AUX_I2C_WRITE:
-int radeon_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode,
+		/* tx_size needs to be 4 even for bare address packets since the atom
-			 u8 write_byte, u8 *read_byte)
+		 * table needs the info in tx_buf[3].
-{
+		 */
-	struct i2c_algo_dp_aux_data *algo_data = adapter->algo_data;
-	struct radeon_i2c_chan *auxch = (struct radeon_i2c_chan *)adapter;
-	u16 address = algo_data->address;
+		tx_size = HEADER_SIZE + msg->size;
-	u8 msg[5];
-	u8 reply[2];
+		if (msg->size == 0)
-	unsigned retry;
+			tx_buf[3] |= BARE_ADDRESS_SIZE << 4;
-	int msg_bytes;
+		else
-	int reply_bytes = 1;
-	int ret;
-	u8 ack;
+			tx_buf[3] |= tx_size << 4;
-	/* Set up the command byte */
+		memcpy(tx_buf + HEADER_SIZE, msg->buffer, msg->size);
-	if (mode & MODE_I2C_READ)
+		ret = radeon_process_aux_ch(chan,
-		msg[2] = AUX_I2C_READ << 4;
+					    tx_buf, tx_size, NULL, 0, delay, &ack);
-	else
-		msg[2] = AUX_I2C_WRITE << 4;
+		if (ret >= 0)
+			/* Return payload size. */
-	if (!(mode & MODE_I2C_STOP))
+			ret = msg->size;
-		msg[2] |= AUX_I2C_MOT << 4;
+		break;
-	msg[0] = address;
+	case DP_AUX_NATIVE_READ:
-	msg[1] = address >> 8;
+	case DP_AUX_I2C_READ:
+		/* tx_size needs to be 4 even for bare address packets since the atom
-	switch (mode) {
+		 * table needs the info in tx_buf[3].
-	case MODE_I2C_WRITE:
+		 */
-		msg_bytes = 5;
-		msg[3] = msg_bytes << 4;
+		tx_size = HEADER_SIZE;
-		msg[4] = write_byte;
+		if (msg->size == 0)
-				break;
+			tx_buf[3] |= BARE_ADDRESS_SIZE << 4;
-	case MODE_I2C_READ:
-		msg_bytes = 4;
-		msg[3] = msg_bytes << 4;
-				break;
+		else
-			default:
-		msg_bytes = 4;
+			tx_buf[3] |= tx_size << 4;
-		msg[3] = 3 << 4;
+		ret = radeon_process_aux_ch(chan,
-				break;
+					    tx_buf, tx_size, msg->buffer, msg->size, delay, &ack);
 		break;
-	for (retry = 0; retry < 4; retry++) {
-		ret = radeon_process_aux_ch(auxch,
+	default:
-					    msg, msg_bytes, reply, reply_bytes, 0, &ack);
-		if (ret == -EBUSY)
+		ret = -EINVAL;
-			continue;
+		break;
-		else if (ret < 0) {
-			DRM_DEBUG_KMS("aux_ch failed %d\n", ret);
-			return ret;
-		}
-		switch (ack & AUX_NATIVE_REPLY_MASK) {
-		case AUX_NATIVE_REPLY_ACK:
-			/* I2C-over-AUX Reply field is only valid
-			 * when paired with AUX ACK.
-			 */
-		break;
-		case AUX_NATIVE_REPLY_NACK:
+			}
-			DRM_DEBUG_KMS("aux_ch native nack\n");
-			return -EREMOTEIO;
-		case AUX_NATIVE_REPLY_DEFER:
-			DRM_DEBUG_KMS("aux_ch native defer\n");
-			udelay(400);
-			continue;
+	if (ret >= 0)
-		default:
-			DRM_ERROR("aux_ch invalid native reply 0x%02x\n", ack);
+		msg->reply = ack >> 4;
-			return -EREMOTEIO;
-		}
+			return ret;
-		switch (ack & AUX_I2C_REPLY_MASK) {
-		case AUX_I2C_REPLY_ACK:
+}
-			if (mode == MODE_I2C_READ)
-				*read_byte = reply[0];
-			return ret;
-		case AUX_I2C_REPLY_NACK:
-			DRM_DEBUG_KMS("aux_i2c nack\n");
-			return -EREMOTEIO;
+void radeon_dp_aux_init(struct radeon_connector *radeon_connector)
 		case AUX_I2C_REPLY_DEFER:
-			DRM_DEBUG_KMS("aux_i2c defer\n");
+	int ret;
 	return (link_rate * lane_num * 8) / bpp;
+}
+/***** radeon specific DP functions *****/
+static int radeon_dp_get_max_link_rate(struct drm_connector *connector,
+				       u8 dpcd[DP_DPCD_SIZE])
+{
+	int max_link_rate;
+	if (radeon_connector_is_dp12_capable(connector))
+		max_link_rate = min(drm_dp_max_link_rate(dpcd), 540000);
+	else
+		max_link_rate = min(drm_dp_max_link_rate(dpcd), 270000);
+	return max_link_rate;
 /***** radeon specific DP functions *****/
 /* First get the min lane# when low rate is used according to pixel clock
  * (prefer low rate), second check max lane# supported by DP panel,
  * if the max lane# < low rate lane# then use max lane# instead.
  */
 static int radeon_dp_get_dp_lane_number(struct drm_connector *connector,
 					u8 dpcd[DP_DPCD_SIZE],
 					int pix_clock)
 {
 	int bpp = convert_bpc_to_bpp(radeon_get_monitor_bpc(connector));
-	int max_link_rate = drm_dp_max_link_rate(dpcd);
+	int max_link_rate = radeon_dp_get_max_link_rate(connector, dpcd);
 	int max_lane_num = drm_dp_max_lane_count(dpcd);
 	int lane_num;
 		max_pix_clock = dp_get_max_dp_pix_clock(540000, lane_num, bpp);
 		if (pix_clock <= max_pix_clock)
 			return 540000;
+	}
-	return drm_dp_max_link_rate(dpcd);
+	return radeon_dp_get_max_link_rate(connector, dpcd);
+}
 static u8 radeon_dp_encoder_service(struct radeon_device *rdev,
 	return args.ucStatus;
+}
 u8 radeon_dp_getsinktype(struct radeon_connector *radeon_connector)
-{
 	struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;
 	struct drm_device *dev = radeon_connector->base.dev;
 	struct radeon_device *rdev = dev->dev_private;
 	return radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_GET_SINK_TYPE, 0,
-					 dig_connector->dp_i2c_bus->rec.i2c_id, 0);
+					 radeon_connector->ddc_bus->rec.i2c_id, 0);
+}
 static void radeon_dp_probe_oui(struct radeon_connector *radeon_connector)
+{
 	struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;
 	u8 buf[3];
 	if (!(dig_connector->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
 		return;
-	if (radeon_dp_aux_native_read(radeon_connector, DP_SINK_OUI, buf, 3, 0))
+	if (drm_dp_dpcd_read(&radeon_connector->ddc_bus->aux, DP_SINK_OUI, buf, 3) == 3)
 		DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n",
 			      buf[0], buf[1], buf[2]);
-	if (radeon_dp_aux_native_read(radeon_connector, DP_BRANCH_OUI, buf, 3, 0))
+	if (drm_dp_dpcd_read(&radeon_connector->ddc_bus->aux, DP_BRANCH_OUI, buf, 3) == 3)
 		DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
 			      buf[0], buf[1], buf[2]);
+}
-}
+bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector)
+{
-bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector)
+	struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;
 	u8 msg[DP_DPCD_SIZE];
-	struct radeon_connector_atom_dig *dig_connector = radeon_connector->con_priv;
+	int ret;
-	u8 msg[DP_DPCD_SIZE];
-	int ret, i;
+	char dpcd_hex_dump[DP_DPCD_SIZE * 3];
-	ret = radeon_dp_aux_native_read(radeon_connector, DP_DPCD_REV, msg,
+	ret = drm_dp_dpcd_read(&radeon_connector->ddc_bus->aux, DP_DPCD_REV, msg,
-					DP_DPCD_SIZE, 0);
+			       DP_DPCD_SIZE);
 	if (ret > 0) {
 				     struct drm_connector *connector)
+{
 	struct drm_device *dev = encoder->dev;
 	struct radeon_device *rdev = dev->dev_private;
 	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+	struct radeon_connector_atom_dig *dig_connector;
 	int panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;
 	u16 dp_bridge = radeon_connector_encoder_get_dp_bridge_encoder_id(connector);
 	u8 tmp;
 	if (!ASIC_IS_DCE4(rdev))
+		return panel_mode;
+	if (!radeon_connector->con_priv)
+		return panel_mode;
-		return panel_mode;
+	dig_connector = radeon_connector->con_priv;
 	if (dp_bridge != ENCODER_OBJECT_ID_NONE) {
+		/* DP bridge chips */
-		/* DP bridge chips */
+		if (drm_dp_dpcd_readb(&radeon_connector->ddc_bus->aux,
-		tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP);
+				      DP_EDP_CONFIGURATION_CAP, &tmp) == 1) {
 		if (tmp & 1)
 			panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
 		else if ((dp_bridge == ENCODER_OBJECT_ID_NUTMEG) ||
 			 (dp_bridge == ENCODER_OBJECT_ID_TRAVIS))
 		panel_mode = DP_PANEL_MODE_INTERNAL_DP1_MODE;
+		else
-		else
+			panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;
 			panel_mode = DP_PANEL_MODE_EXTERNAL_DP_MODE;
 	} else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) {
+		/* eDP */
-		/* eDP */
+		if (drm_dp_dpcd_readb(&radeon_connector->ddc_bus->aux,
-		tmp = radeon_read_dpcd_reg(radeon_connector, DP_EDP_CONFIGURATION_CAP);
+				      DP_EDP_CONFIGURATION_CAP, &tmp) == 1) {
 		if (tmp & 1)
+			panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
 			panel_mode = DP_PANEL_MODE_INTERNAL_DP2_MODE;
+	}
 		return MODE_CLOCK_HIGH;
 	return MODE_OK;
-}
-static bool radeon_dp_get_link_status(struct radeon_connector *radeon_connector,
-				    u8 link_status[DP_LINK_STATUS_SIZE])
-{
-	int ret;
-	ret = radeon_dp_aux_native_read(radeon_connector, DP_LANE0_1_STATUS,
-					link_status, DP_LINK_STATUS_SIZE, 100);
-	if (ret <= 0) {
-		return false;
-	}
-	DRM_DEBUG_KMS("link status %*ph\n", 6, link_status);
-	return true;
+}
 bool radeon_dp_needs_link_train(struct radeon_connector *radeon_connector)
+{
 	u8 link_status[DP_LINK_STATUS_SIZE];
+	struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
 	struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
 	if (drm_dp_dpcd_read_link_status(&radeon_connector->ddc_bus->aux, link_status)
-	if (!radeon_dp_get_link_status(radeon_connector, link_status))
+	    <= 0)
 		return false;
 	if (drm_dp_channel_eq_ok(link_status, dig->dp_lane_count))
+		return false;
+	return true;
+}
+void radeon_dp_set_rx_power_state(struct drm_connector *connector,
+				  u8 power_state)
+{
+	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+	struct radeon_connector_atom_dig *dig_connector;
+	if (!radeon_connector->con_priv)
+		return;
+	dig_connector = radeon_connector->con_priv;
+	/* power up/down the sink */
+	if (dig_connector->dpcd[0] >= 0x11) {
+		drm_dp_dpcd_writeb(&radeon_connector->ddc_bus->aux,
+				   DP_SET_POWER, power_state);
+		usleep_range(1000, 2000);
 		return false;
 	return true;
-struct radeon_dp_link_train_info {
-	struct radeon_device *rdev;
+struct radeon_dp_link_train_info {
-	struct drm_encoder *encoder;
+	struct radeon_device *rdev;
-	struct drm_connector *connector;
+	struct drm_encoder *encoder;
-	struct radeon_connector *radeon_connector;
+	struct drm_connector *connector;
 	int enc_id;
 	int dp_clock;
 	int dp_lane_count;
 	bool tp3_supported;
 	u8 dpcd[DP_RECEIVER_CAP_SIZE];
+	u8 train_set[4];
-	u8 train_set[4];
+	u8 link_status[DP_LINK_STATUS_SIZE];
-	u8 link_status[DP_LINK_STATUS_SIZE];
+	u8 tries;
-	u8 tries;
+	bool use_dpencoder;
-	bool use_dpencoder;
+	struct drm_dp_aux *aux;
 };
 static void radeon_dp_update_vs_emph(struct radeon_dp_link_train_info *dp_info)
+{
 	/* set the initial vs/emph on the source */
 	atombios_dig_transmitter_setup(dp_info->encoder,
 				       ATOM_TRANSMITTER_ACTION_SETUP_VSEMPH,
 , dp_info->train_set[0]); /* sets all lanes at once */
 	/* set the vs/emph on the sink */
 		radeon_dp_encoder_service(dp_info->rdev, ATOM_DP_ACTION_TRAINING_PATTERN_SEL,
 					  dp_info->dp_clock, dp_info->enc_id, rtp);
+	}
 	/* enable training pattern on the sink */
-	radeon_write_dpcd_reg(dp_info->radeon_connector, DP_TRAINING_PATTERN_SET, tp);
+	drm_dp_dpcd_writeb(dp_info->aux, DP_TRAINING_PATTERN_SET, tp);
+}
 static int radeon_dp_link_train_init(struct radeon_dp_link_train_info *dp_info)
+{
 	struct radeon_encoder *radeon_encoder = to_radeon_encoder(dp_info->encoder);
 	struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
-	u8 tmp;
+	u8 tmp;
-	/* power up the sink */
 	if (dp_info->dpcd[0] >= 0x11)
-		radeon_write_dpcd_reg(dp_info->radeon_connector,
+	/* power up the sink */
-				      DP_SET_POWER, DP_SET_POWER_D0);
+	radeon_dp_set_rx_power_state(dp_info->connector, DP_SET_POWER_D0);
 	/* possibly enable downspread on the sink */
 	if (dp_info->dpcd[3] & 0x1)
-		radeon_write_dpcd_reg(dp_info->radeon_connector,
+		drm_dp_dpcd_writeb(dp_info->aux,
 				      DP_DOWNSPREAD_CTRL, DP_SPREAD_AMP_0_5);
 	else
-		radeon_write_dpcd_reg(dp_info->radeon_connector,
+		drm_dp_dpcd_writeb(dp_info->aux,
 				      DP_DOWNSPREAD_CTRL, 0);
 	if ((dp_info->connector->connector_type == DRM_MODE_CONNECTOR_eDP) &&
 	    (dig->panel_mode == DP_PANEL_MODE_INTERNAL_DP2_MODE)) {
-		radeon_write_dpcd_reg(dp_info->radeon_connector, DP_EDP_CONFIGURATION_SET, 1);
 		drm_dp_dpcd_writeb(dp_info->aux, DP_EDP_CONFIGURATION_SET, 1);
+	}
 	/* set the lane count on the sink */
-	tmp = dp_info->dp_lane_count;
+	/* set the lane count on the sink */
-	if (dp_info->dpcd[DP_DPCD_REV] >= 0x11 &&
+	tmp = dp_info->dp_lane_count;
-	    dp_info->dpcd[DP_MAX_LANE_COUNT] & DP_ENHANCED_FRAME_CAP)
+	if (drm_dp_enhanced_frame_cap(dp_info->dpcd))
 		tmp |= DP_LANE_COUNT_ENHANCED_FRAME_EN;
-	radeon_write_dpcd_reg(dp_info->radeon_connector, DP_LANE_COUNT_SET, tmp);
+	drm_dp_dpcd_writeb(dp_info->aux, DP_LANE_COUNT_SET, tmp);
 	/* set the link rate on the sink */
 	tmp = drm_dp_link_rate_to_bw_code(dp_info->dp_clock);
-	radeon_write_dpcd_reg(dp_info->radeon_connector, DP_LINK_BW_SET, tmp);
+	drm_dp_dpcd_writeb(dp_info->aux, DP_LINK_BW_SET, tmp);
 	/* start training on the source */
 	if (ASIC_IS_DCE4(dp_info->rdev) || !dp_info->use_dpencoder)
 		atombios_dig_encoder_setup(dp_info->encoder,
 					   ATOM_ENCODER_CMD_DP_LINK_TRAINING_START, 0);
 	else
 static int radeon_dp_link_train_finish(struct radeon_dp_link_train_info *dp_info)
+{
 	udelay(400);
 	/* disable the training pattern on the sink */
-	radeon_write_dpcd_reg(dp_info->radeon_connector,
+	drm_dp_dpcd_writeb(dp_info->aux,
 			      DP_TRAINING_PATTERN_SET,
 			      DP_TRAINING_PATTERN_DISABLE);
 	dp_info->tries = 0;
 	voltage = 0xff;
 	while (1) {
 		drm_dp_link_train_clock_recovery_delay(dp_info->dpcd);
+		if (drm_dp_dpcd_read_link_status(dp_info->aux,
-		if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status)) {
+						 dp_info->link_status) <= 0) {
 			DRM_ERROR("displayport link status failed\n");
 			break;
+		}
 	dp_info->tries = 0;
 	channel_eq = false;
 	while (1) {
 		drm_dp_link_train_channel_eq_delay(dp_info->dpcd);
+		if (drm_dp_dpcd_read_link_status(dp_info->aux,
-		if (!radeon_dp_get_link_status(dp_info->radeon_connector, dp_info->link_status)) {
+						 dp_info->link_status) <= 0) {
 			DRM_ERROR("displayport link status failed\n");
 			break;
+		}
 	if (dig->linkb)
 		dp_info.enc_id |= ATOM_DP_CONFIG_LINK_B;
 	else
 		dp_info.enc_id |= ATOM_DP_CONFIG_LINK_A;
+	if (drm_dp_dpcd_readb(&radeon_connector->ddc_bus->aux, DP_MAX_LANE_COUNT, &tmp)
-	tmp = radeon_read_dpcd_reg(radeon_connector, DP_MAX_LANE_COUNT);
+	    == 1) {
 	if (ASIC_IS_DCE5(rdev) && (tmp & DP_TPS3_SUPPORTED))
 		dp_info.tp3_supported = true;
 	else
+		dp_info.tp3_supported = false;
+	} else {
+		dp_info.tp3_supported = false;
 		dp_info.tp3_supported = false;
 	memcpy(dp_info.dpcd, dig_connector->dpcd, DP_RECEIVER_CAP_SIZE);
 	dp_info.rdev = rdev;
-	dp_info.encoder = encoder;
-	dp_info.connector = connector;
+	dp_info.encoder = encoder;
-	dp_info.radeon_connector = radeon_connector;
+	dp_info.connector = connector;
+	dp_info.dp_lane_count = dig_connector->dp_lane_count;
-	dp_info.dp_lane_count = dig_connector->dp_lane_count;
+	dp_info.dp_clock = dig_connector->dp_clock;
-	dp_info.dp_clock = dig_connector->dp_clock;
+	dp_info.aux = &radeon_connector->ddc_bus->aux;
 	if (radeon_dp_link_train_init(&dp_info))

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/atombios_dp.c – Rev 3764 → 5078