Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6659 → Rev 6660

/drivers/video/drm/drm_dp_helper.c
178,7 → 178,7
{
struct drm_dp_aux_msg msg;
unsigned int retry;
int err;
int err = 0;
 
memset(&msg, 0, sizeof(msg));
msg.address = offset;
186,6 → 186,8
msg.buffer = buffer;
msg.size = size;
 
mutex_lock(&aux->hw_mutex);
 
/*
* The specification doesn't give any recommendation on how often to
* retry native transactions. We used to retry 7 times like for
194,14 → 196,12
*/
for (retry = 0; retry < 32; retry++) {
 
mutex_lock(&aux->hw_mutex);
err = aux->transfer(aux, &msg);
mutex_unlock(&aux->hw_mutex);
if (err < 0) {
if (err == -EBUSY)
continue;
 
return err;
goto unlock;
}
 
 
208,11 → 208,12
switch (msg.reply & DP_AUX_NATIVE_REPLY_MASK) {
case DP_AUX_NATIVE_REPLY_ACK:
if (err < size)
return -EPROTO;
return err;
err = -EPROTO;
goto unlock;
 
case DP_AUX_NATIVE_REPLY_NACK:
return -EIO;
err = -EIO;
goto unlock;
 
case DP_AUX_NATIVE_REPLY_DEFER:
usleep_range(AUX_RETRY_INTERVAL, AUX_RETRY_INTERVAL + 100);
221,7 → 222,11
}
 
DRM_DEBUG_KMS("too many retries, giving up\n");
return -EIO;
err = -EIO;
 
unlock:
mutex_unlock(&aux->hw_mutex);
return err;
}
 
/**
543,9 → 548,7
int max_retries = max(7, drm_dp_i2c_retry_count(msg, dp_aux_i2c_speed_khz));
 
for (retry = 0, defer_i2c = 0; retry < (max_retries + defer_i2c); retry++) {
mutex_lock(&aux->hw_mutex);
ret = aux->transfer(aux, msg);
mutex_unlock(&aux->hw_mutex);
if (ret < 0) {
if (ret == -EBUSY)
continue;
684,6 → 687,8
 
memset(&msg, 0, sizeof(msg));
 
mutex_lock(&aux->hw_mutex);
 
for (i = 0; i < num; i++) {
msg.address = msgs[i].addr;
drm_dp_i2c_msg_set_request(&msg, &msgs[i]);
738,6 → 743,8
msg.size = 0;
(void)drm_dp_i2c_do_msg(aux, &msg);
 
mutex_unlock(&aux->hw_mutex);
 
return err;
}