leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/sdvo: Fix up debug output to not split lines

Browse Source 
It leads to a big mess when stuff interleaves. Especially with the new
patch I've submitted for the drm core to no longer artificially split
up debug messages.

v2: The size parameter to snprintf includes the terminating 0, but the
return value does not. Adjust the logic accordingly. Spotted by Mika.

Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2013-11-27 16:03:01 +01:00
parent 5bc0e85cc6
commit 84fcb46977
1 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/gpu/drm/i915/intel_sdvo.c
View File

@ -413,23 +413,34 @@ static const struct _sdvo_cmd_name {
static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd, static void intel_sdvo_debug_write(struct intel_sdvo *intel_sdvo, u8 cmd,
const void *args, int args_len) const void *args, int args_len)
{ {
int i; int i, pos = 0;
#define BUF_LEN 256
char buffer[BUF_LEN];
DRM_DEBUG_KMS("%s: W: %02X ", #define BUF_PRINT(args...) \
SDVO_NAME(intel_sdvo), cmd); pos += snprintf(buffer + pos, max_t(int, BUF_LEN - pos, 0), args)
for (i = 0; i < args_len; i++)
DRM_LOG_KMS("%02X ", ((u8 *)args)[i]);
for (; i < 8; i++) for (i = 0; i < args_len; i++) {
DRM_LOG_KMS(" "); BUF_PRINT("%02X ", ((u8 *)args)[i]);
}
for (; i < 8; i++) {
BUF_PRINT(" ");
}
for (i = 0; i < ARRAY_SIZE(sdvo_cmd_names); i++) { for (i = 0; i < ARRAY_SIZE(sdvo_cmd_names); i++) {
if (cmd == sdvo_cmd_names[i].cmd) { if (cmd == sdvo_cmd_names[i].cmd) {
DRM_LOG_KMS("(%s)", sdvo_cmd_names[i].name); BUF_PRINT("(%s)", sdvo_cmd_names[i].name);
break; break;
} }
} }
if (i == ARRAY_SIZE(sdvo_cmd_names)) if (i == ARRAY_SIZE(sdvo_cmd_names)) {
DRM_LOG_KMS("(%02X)", cmd); BUF_PRINT("(%02X)", cmd);
DRM_LOG_KMS("\n"); }
BUG_ON(pos >= BUF_LEN - 1);
#undef BUF_PRINT
#undef BUF_LEN
DRM_DEBUG_KMS("%s: W: %02X %s\n", SDVO_NAME(intel_sdvo), cmd, buffer);
} }
static const char *cmd_status_names[] = { static const char *cmd_status_names[] = {
@ -512,9 +523,10 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
{ {
u8 retry = 15; /* 5 quick checks, followed by 10 long checks */ u8 retry = 15; /* 5 quick checks, followed by 10 long checks */
u8 status; u8 status;
int i; int i, pos = 0;
#define BUF_LEN 256
char buffer[BUF_LEN];
DRM_DEBUG_KMS("%s: R: ", SDVO_NAME(intel_sdvo));
/* /*
* The documentation states that all commands will be * The documentation states that all commands will be
@ -551,10 +563,13 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
goto log_fail; goto log_fail;
} }
#define BUF_PRINT(args...) \
pos += snprintf(buffer + pos, max_t(int, BUF_LEN - pos, 0), args)
if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP) if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP)
DRM_LOG_KMS("(%s)", cmd_status_names[status]); BUF_PRINT("(%s)", cmd_status_names[status]);
else else
DRM_LOG_KMS("(??? %d)", status); BUF_PRINT("(??? %d)", status);
if (status != SDVO_CMD_STATUS_SUCCESS) if (status != SDVO_CMD_STATUS_SUCCESS)
goto log_fail; goto log_fail;
@ -565,13 +580,17 @@ static bool intel_sdvo_read_response(struct intel_sdvo *intel_sdvo,
SDVO_I2C_RETURN_0 + i, SDVO_I2C_RETURN_0 + i,
&((u8 *)response)[i])) &((u8 *)response)[i]))
goto log_fail; goto log_fail;
DRM_LOG_KMS(" %02X", ((u8 *)response)[i]); BUF_PRINT(" %02X", ((u8 *)response)[i]);
} }
DRM_LOG_KMS("\n"); BUG_ON(pos >= BUF_LEN - 1);
#undef BUF_PRINT
#undef BUF_LEN
DRM_DEBUG_KMS("%s: R: %s\n", SDVO_NAME(intel_sdvo), buffer);
return true; return true;
log_fail: log_fail:
DRM_LOG_KMS("... failed\n"); DRM_DEBUG_KMS("%s: R: ... failed\n", SDVO_NAME(intel_sdvo));
return false; return false;
} }