aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-11-27 13:14:37 -0500
committerDave Airlie <airlied@redhat.com>2009-12-07 19:22:49 -0500
commit53c1e09fea4cf3fc0ec1f735a5fcab78c43cb55d (patch)
tree820f9c17822a0b8ad9015eb07b7f716f2ce32008
parent9fa05c98d69eb77c82e59b5e434ca63bba230ba0 (diff)
drm/radeon/kms: clean up DP debugging
Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/atombios_dp.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
index 75977a46ba1..784ba80afcb 100644
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
@@ -44,12 +44,12 @@ static char *pre_emph_names[] = {
44}; 44};
45 45
46static const int dp_clocks[] = { 46static const int dp_clocks[] = {
47 54000, // 1 lane, 1.62 Ghz 47 54000, /* 1 lane, 1.62 Ghz */
48 90000, // 1 lane, 2.70 Ghz 48 90000, /* 1 lane, 2.70 Ghz */
49 108000, // 2 lane, 1.62 Ghz 49 108000, /* 2 lane, 1.62 Ghz */
50 180000, // 2 lane, 2.70 Ghz 50 180000, /* 2 lane, 2.70 Ghz */
51 216000, // 4 lane, 1.62 Ghz 51 216000, /* 4 lane, 1.62 Ghz */
52 360000, // 4 lane, 2.70 Ghz 52 360000, /* 4 lane, 2.70 Ghz */
53}; 53};
54 54
55static const int num_dp_clocks = sizeof(dp_clocks) / sizeof(int); 55static const int num_dp_clocks = sizeof(dp_clocks) / sizeof(int);
@@ -296,10 +296,10 @@ static void dp_get_adjust_train(u8 link_status[DP_LINK_STATUS_SIZE],
296 u8 this_v = dp_get_adjust_request_voltage(link_status, lane); 296 u8 this_v = dp_get_adjust_request_voltage(link_status, lane);
297 u8 this_p = dp_get_adjust_request_pre_emphasis(link_status, lane); 297 u8 this_p = dp_get_adjust_request_pre_emphasis(link_status, lane);
298 298
299 DRM_INFO("requested signal parameters: lane %d voltage %s pre_emph %s\n", 299 DRM_DEBUG("requested signal parameters: lane %d voltage %s pre_emph %s\n",
300 lane, 300 lane,
301 voltage_names[this_v >> DP_TRAIN_VOLTAGE_SWING_SHIFT], 301 voltage_names[this_v >> DP_TRAIN_VOLTAGE_SWING_SHIFT],
302 pre_emph_names[this_p >> DP_TRAIN_PRE_EMPHASIS_SHIFT]); 302 pre_emph_names[this_p >> DP_TRAIN_PRE_EMPHASIS_SHIFT]);
303 303
304 if (this_v > v) 304 if (this_v > v)
305 v = this_v; 305 v = this_v;
@@ -313,9 +313,9 @@ static void dp_get_adjust_train(u8 link_status[DP_LINK_STATUS_SIZE],
313 if (p >= dp_pre_emphasis_max(v)) 313 if (p >= dp_pre_emphasis_max(v))
314 p = dp_pre_emphasis_max(v) | DP_TRAIN_MAX_PRE_EMPHASIS_REACHED; 314 p = dp_pre_emphasis_max(v) | DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
315 315
316 DRM_INFO("using signal parameters: voltage %s pre_emph %s\n", 316 DRM_DEBUG("using signal parameters: voltage %s pre_emph %s\n",
317 voltage_names[(v & DP_TRAIN_VOLTAGE_SWING_MASK) >> DP_TRAIN_VOLTAGE_SWING_SHIFT], 317 voltage_names[(v & DP_TRAIN_VOLTAGE_SWING_MASK) >> DP_TRAIN_VOLTAGE_SWING_SHIFT],
318 pre_emph_names[(p & DP_TRAIN_PRE_EMPHASIS_MASK) >> DP_TRAIN_PRE_EMPHASIS_SHIFT]); 318 pre_emph_names[(p & DP_TRAIN_PRE_EMPHASIS_MASK) >> DP_TRAIN_PRE_EMPHASIS_SHIFT]);
319 319
320 for (lane = 0; lane < 4; lane++) 320 for (lane = 0; lane < 4; lane++)
321 train_set[lane] = v | p; 321 train_set[lane] = v | p;
@@ -348,7 +348,7 @@ bool radeon_process_aux_ch(struct radeon_i2c_chan *chan, u8 *req_bytes,
348 atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); 348 atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
349 349
350 if (args.ucReplyStatus) { 350 if (args.ucReplyStatus) {
351 DRM_ERROR("failed to get auxch %02x%02x %02x %02x 0x%02x %02x\n", 351 DRM_DEBUG("failed to get auxch %02x%02x %02x %02x 0x%02x %02x\n",
352 req_bytes[1], req_bytes[0], req_bytes[2], req_bytes[3], 352 req_bytes[1], req_bytes[0], req_bytes[2], req_bytes[3],
353 chan->rec.i2c_id, args.ucReplyStatus); 353 chan->rec.i2c_id, args.ucReplyStatus);
354 return false; 354 return false;
@@ -451,10 +451,10 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector)
451 memcpy(dig_connector->dpcd, msg, 8); 451 memcpy(dig_connector->dpcd, msg, 8);
452 { 452 {
453 int i; 453 int i;
454 printk("DPCD: "); 454 DRM_DEBUG("DPCD: ");
455 for (i = 0; i < 8; i++) 455 for (i = 0; i < 8; i++)
456 printk("%02x ", msg[i]); 456 DRM_DEBUG("%02x ", msg[i]);
457 printk("\n"); 457 DRM_DEBUG("\n");
458 } 458 }
459 return true; 459 return true;
460 } 460 }
@@ -501,9 +501,9 @@ static bool atom_dp_get_link_status(struct radeon_connector *radeon_connector,
501 return false; 501 return false;
502 } 502 }
503 503
504 DRM_INFO("link status %02x %02x %02x %02x %02x %02x\n", 504 DRM_DEBUG("link status %02x %02x %02x %02x %02x %02x\n",
505 link_status[0], link_status[1], link_status[2], 505 link_status[0], link_status[1], link_status[2],
506 link_status[3], link_status[4], link_status[5]); 506 link_status[3], link_status[4], link_status[5]);
507 return true; 507 return true;
508} 508}
509 509
@@ -671,10 +671,10 @@ void dp_link_train(struct drm_encoder *encoder,
671 if (!clock_recovery) 671 if (!clock_recovery)
672 DRM_ERROR("clock recovery failed\n"); 672 DRM_ERROR("clock recovery failed\n");
673 else 673 else
674 DRM_INFO("clock recovery at voltage %d pre-emphasis %d\n", 674 DRM_DEBUG("clock recovery at voltage %d pre-emphasis %d\n",
675 train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK, 675 train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK,
676 (train_set[0] & DP_TRAIN_PRE_EMPHASIS_MASK) >> 676 (train_set[0] & DP_TRAIN_PRE_EMPHASIS_MASK) >>
677 DP_TRAIN_PRE_EMPHASIS_SHIFT); 677 DP_TRAIN_PRE_EMPHASIS_SHIFT);
678 678
679 679
680 /* set training pattern 2 on the sink */ 680 /* set training pattern 2 on the sink */
@@ -712,10 +712,10 @@ void dp_link_train(struct drm_encoder *encoder,
712 if (!channel_eq) 712 if (!channel_eq)
713 DRM_ERROR("channel eq failed\n"); 713 DRM_ERROR("channel eq failed\n");
714 else 714 else
715 DRM_INFO("channel eq at voltage %d pre-emphasis %d\n", 715 DRM_DEBUG("channel eq at voltage %d pre-emphasis %d\n",
716 train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK, 716 train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK,
717 (train_set[0] & DP_TRAIN_PRE_EMPHASIS_MASK) 717 (train_set[0] & DP_TRAIN_PRE_EMPHASIS_MASK)
718 >> DP_TRAIN_PRE_EMPHASIS_SHIFT); 718 >> DP_TRAIN_PRE_EMPHASIS_SHIFT);
719 719
720 /* disable the training pattern on the sink */ 720 /* disable the training pattern on the sink */
721 dp_set_training(radeon_connector, DP_TRAINING_PATTERN_DISABLE); 721 dp_set_training(radeon_connector, DP_TRAINING_PATTERN_DISABLE);