Commit 342dc382 authored by yakui_zhao's avatar yakui_zhao Committed by Dave Airlie

drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in intel_sdvo

Use the DRM_DEBUG_KMS/DEBUG_LOG_KMS to print the debug info for
SDVO device.
Signed-off-by: default avatarZhao Yakui <yakui.zhao@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7fb85bfb
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "intel_sdvo_regs.h" #include "intel_sdvo_regs.h"
#undef SDVO_DEBUG #undef SDVO_DEBUG
#define I915_SDVO "i915_sdvo"
struct intel_sdvo_priv { struct intel_sdvo_priv {
struct intel_i2c_chan *i2c_bus; struct intel_i2c_chan *i2c_bus;
int slaveaddr; int slaveaddr;
...@@ -277,20 +277,21 @@ static void intel_sdvo_debug_write(struct intel_output *intel_output, u8 cmd, ...@@ -277,20 +277,21 @@ static void intel_sdvo_debug_write(struct intel_output *intel_output, u8 cmd,
struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv; struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
int i; int i;
printk(KERN_DEBUG "%s: W: %02X ", SDVO_NAME(sdvo_priv), cmd); DRM_DEBUG_KMS(I915_SDVO, "%s: W: %02X ",
SDVO_NAME(sdvo_priv), cmd);
for (i = 0; i < args_len; i++) for (i = 0; i < args_len; i++)
printk(KERN_DEBUG "%02X ", ((u8 *)args)[i]); DRM_LOG_KMS("%02X ", ((u8 *)args)[i]);
for (; i < 8; i++) for (; i < 8; i++)
printk(KERN_DEBUG " "); DRM_LOG_KMS(" ");
for (i = 0; i < sizeof(sdvo_cmd_names) / sizeof(sdvo_cmd_names[0]); i++) { for (i = 0; i < sizeof(sdvo_cmd_names) / sizeof(sdvo_cmd_names[0]); i++) {
if (cmd == sdvo_cmd_names[i].cmd) { if (cmd == sdvo_cmd_names[i].cmd) {
printk(KERN_DEBUG "(%s)", sdvo_cmd_names[i].name); DRM_LOG_KMS("(%s)", sdvo_cmd_names[i].name);
break; break;
} }
} }
if (i == sizeof(sdvo_cmd_names)/ sizeof(sdvo_cmd_names[0])) if (i == sizeof(sdvo_cmd_names)/ sizeof(sdvo_cmd_names[0]))
printk(KERN_DEBUG "(%02X)", cmd); DRM_LOG_KMS("(%02X)", cmd);
printk(KERN_DEBUG "\n"); DRM_LOG_KMS("\n");
} }
#else #else
#define intel_sdvo_debug_write(o, c, a, l) #define intel_sdvo_debug_write(o, c, a, l)
...@@ -329,16 +330,16 @@ static void intel_sdvo_debug_response(struct intel_output *intel_output, ...@@ -329,16 +330,16 @@ static void intel_sdvo_debug_response(struct intel_output *intel_output,
struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv; struct intel_sdvo_priv *sdvo_priv = intel_output->dev_priv;
int i; int i;
printk(KERN_DEBUG "%s: R: ", SDVO_NAME(sdvo_priv)); DRM_DEBUG_KMS(I915_SDVO, "%s: R: ", SDVO_NAME(sdvo_priv));
for (i = 0; i < response_len; i++) for (i = 0; i < response_len; i++)
printk(KERN_DEBUG "%02X ", ((u8 *)response)[i]); DRM_LOG_KMS("%02X ", ((u8 *)response)[i]);
for (; i < 8; i++) for (; i < 8; i++)
printk(KERN_DEBUG " "); DRM_LOG_KMS(" ");
if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP) if (status <= SDVO_CMD_STATUS_SCALING_NOT_SUPP)
printk(KERN_DEBUG "(%s)", cmd_status_names[status]); DRM_LOG_KMS("(%s)", cmd_status_names[status]);
else else
printk(KERN_DEBUG "(??? %d)", status); DRM_LOG_KMS("(??? %d)", status);
printk(KERN_DEBUG "\n"); DRM_LOG_KMS("\n");
} }
#else #else
#define intel_sdvo_debug_response(o, r, l, s) #define intel_sdvo_debug_response(o, r, l, s)
...@@ -1824,7 +1825,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device) ...@@ -1824,7 +1825,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
/* Read the regs to test if we can talk to the device */ /* Read the regs to test if we can talk to the device */
for (i = 0; i < 0x40; i++) { for (i = 0; i < 0x40; i++) {
if (!intel_sdvo_read_byte(intel_output, i, &ch[i])) { if (!intel_sdvo_read_byte(intel_output, i, &ch[i])) {
DRM_DEBUG("No SDVO device found on SDVO%c\n", DRM_DEBUG_KMS(I915_SDVO,
"No SDVO device found on SDVO%c\n",
output_device == SDVOB ? 'B' : 'C'); output_device == SDVOB ? 'B' : 'C');
goto err_i2c; goto err_i2c;
} }
...@@ -1909,7 +1911,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device) ...@@ -1909,7 +1911,8 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
sdvo_priv->controlled_output = 0; sdvo_priv->controlled_output = 0;
memcpy (bytes, &sdvo_priv->caps.output_flags, 2); memcpy (bytes, &sdvo_priv->caps.output_flags, 2);
DRM_DEBUG("%s: Unknown SDVO output type (0x%02x%02x)\n", DRM_DEBUG_KMS(I915_SDVO,
"%s: Unknown SDVO output type (0x%02x%02x)\n",
SDVO_NAME(sdvo_priv), SDVO_NAME(sdvo_priv),
bytes[0], bytes[1]); bytes[0], bytes[1]);
encoder_type = DRM_MODE_ENCODER_NONE; encoder_type = DRM_MODE_ENCODER_NONE;
...@@ -1941,7 +1944,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device) ...@@ -1941,7 +1944,7 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
&sdvo_priv->pixel_clock_max); &sdvo_priv->pixel_clock_max);
DRM_DEBUG("%s device VID/DID: %02X:%02X.%02X, " DRM_DEBUG_KMS(I915_SDVO, "%s device VID/DID: %02X:%02X.%02X, "
"clock range %dMHz - %dMHz, " "clock range %dMHz - %dMHz, "
"input 1: %c, input 2: %c, " "input 1: %c, input 2: %c, "
"output 1: %c, output 2: %c\n", "output 1: %c, output 2: %c\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment