diff options
author | Zhao Yakui <yakui.zhao@intel.com> | 2009-10-08 23:39:43 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-11-05 17:47:12 -0500 |
commit | d0c3b04ae953fd3bf69f9b1430c22608d2d3b90d (patch) | |
tree | a1393beb84fb2af282b2c8be8e212dffc2352de1 /drivers/gpu/drm/i915/dvo_ivch.c | |
parent | 3e0f27ed75369298176abdf2fbe59116b6587a56 (diff) |
drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in DVO output code.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/dvo_ivch.c')
-rw-r--r-- | drivers/gpu/drm/i915/dvo_ivch.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/dvo_ivch.c index aa176f9921fe..24169e528f0f 100644 --- a/drivers/gpu/drm/i915/dvo_ivch.c +++ b/drivers/gpu/drm/i915/dvo_ivch.c | |||
@@ -202,7 +202,8 @@ static bool ivch_read(struct intel_dvo_device *dvo, int addr, uint16_t *data) | |||
202 | }; | 202 | }; |
203 | 203 | ||
204 | if (!priv->quiet) { | 204 | if (!priv->quiet) { |
205 | DRM_DEBUG("Unable to read register 0x%02x from %s:%02x.\n", | 205 | DRM_DEBUG_KMS("Unable to read register 0x%02x from " |
206 | "%s:%02x.\n", | ||
206 | addr, i2cbus->adapter.name, dvo->slave_addr); | 207 | addr, i2cbus->adapter.name, dvo->slave_addr); |
207 | } | 208 | } |
208 | return false; | 209 | return false; |
@@ -230,7 +231,7 @@ static bool ivch_write(struct intel_dvo_device *dvo, int addr, uint16_t data) | |||
230 | return true; | 231 | return true; |
231 | 232 | ||
232 | if (!priv->quiet) { | 233 | if (!priv->quiet) { |
233 | DRM_DEBUG("Unable to write register 0x%02x to %s:%d.\n", | 234 | DRM_DEBUG_KMS("Unable to write register 0x%02x to %s:%d.\n", |
234 | addr, i2cbus->adapter.name, dvo->slave_addr); | 235 | addr, i2cbus->adapter.name, dvo->slave_addr); |
235 | } | 236 | } |
236 | 237 | ||
@@ -261,7 +262,7 @@ static bool ivch_init(struct intel_dvo_device *dvo, | |||
261 | * the address it's responding on. | 262 | * the address it's responding on. |
262 | */ | 263 | */ |
263 | if ((temp & VR00_BASE_ADDRESS_MASK) != dvo->slave_addr) { | 264 | if ((temp & VR00_BASE_ADDRESS_MASK) != dvo->slave_addr) { |
264 | DRM_DEBUG("ivch detect failed due to address mismatch " | 265 | DRM_DEBUG_KMS("ivch detect failed due to address mismatch " |
265 | "(%d vs %d)\n", | 266 | "(%d vs %d)\n", |
266 | (temp & VR00_BASE_ADDRESS_MASK), dvo->slave_addr); | 267 | (temp & VR00_BASE_ADDRESS_MASK), dvo->slave_addr); |
267 | goto out; | 268 | goto out; |
@@ -367,41 +368,41 @@ static void ivch_dump_regs(struct intel_dvo_device *dvo) | |||
367 | uint16_t val; | 368 | uint16_t val; |
368 | 369 | ||
369 | ivch_read(dvo, VR00, &val); | 370 | ivch_read(dvo, VR00, &val); |
370 | DRM_DEBUG("VR00: 0x%04x\n", val); | 371 | DRM_LOG_KMS("VR00: 0x%04x\n", val); |
371 | ivch_read(dvo, VR01, &val); | 372 | ivch_read(dvo, VR01, &val); |
372 | DRM_DEBUG("VR01: 0x%04x\n", val); | 373 | DRM_LOG_KMS("VR01: 0x%04x\n", val); |
373 | ivch_read(dvo, VR30, &val); | 374 | ivch_read(dvo, VR30, &val); |
374 | DRM_DEBUG("VR30: 0x%04x\n", val); | 375 | DRM_LOG_KMS("VR30: 0x%04x\n", val); |
375 | ivch_read(dvo, VR40, &val); | 376 | ivch_read(dvo, VR40, &val); |
376 | DRM_DEBUG("VR40: 0x%04x\n", val); | 377 | DRM_LOG_KMS("VR40: 0x%04x\n", val); |
377 | 378 | ||
378 | /* GPIO registers */ | 379 | /* GPIO registers */ |
379 | ivch_read(dvo, VR80, &val); | 380 | ivch_read(dvo, VR80, &val); |
380 | DRM_DEBUG("VR80: 0x%04x\n", val); | 381 | DRM_LOG_KMS("VR80: 0x%04x\n", val); |
381 | ivch_read(dvo, VR81, &val); | 382 | ivch_read(dvo, VR81, &val); |
382 | DRM_DEBUG("VR81: 0x%04x\n", val); | 383 | DRM_LOG_KMS("VR81: 0x%04x\n", val); |
383 | ivch_read(dvo, VR82, &val); | 384 | ivch_read(dvo, VR82, &val); |
384 | DRM_DEBUG("VR82: 0x%04x\n", val); | 385 | DRM_LOG_KMS("VR82: 0x%04x\n", val); |
385 | ivch_read(dvo, VR83, &val); | 386 | ivch_read(dvo, VR83, &val); |
386 | DRM_DEBUG("VR83: 0x%04x\n", val); | 387 | DRM_LOG_KMS("VR83: 0x%04x\n", val); |
387 | ivch_read(dvo, VR84, &val); | 388 | ivch_read(dvo, VR84, &val); |
388 | DRM_DEBUG("VR84: 0x%04x\n", val); | 389 | DRM_LOG_KMS("VR84: 0x%04x\n", val); |
389 | ivch_read(dvo, VR85, &val); | 390 | ivch_read(dvo, VR85, &val); |
390 | DRM_DEBUG("VR85: 0x%04x\n", val); | 391 | DRM_LOG_KMS("VR85: 0x%04x\n", val); |
391 | ivch_read(dvo, VR86, &val); | 392 | ivch_read(dvo, VR86, &val); |
392 | DRM_DEBUG("VR86: 0x%04x\n", val); | 393 | DRM_LOG_KMS("VR86: 0x%04x\n", val); |
393 | ivch_read(dvo, VR87, &val); | 394 | ivch_read(dvo, VR87, &val); |
394 | DRM_DEBUG("VR87: 0x%04x\n", val); | 395 | DRM_LOG_KMS("VR87: 0x%04x\n", val); |
395 | ivch_read(dvo, VR88, &val); | 396 | ivch_read(dvo, VR88, &val); |
396 | DRM_DEBUG("VR88: 0x%04x\n", val); | 397 | DRM_LOG_KMS("VR88: 0x%04x\n", val); |
397 | 398 | ||
398 | /* Scratch register 0 - AIM Panel type */ | 399 | /* Scratch register 0 - AIM Panel type */ |
399 | ivch_read(dvo, VR8E, &val); | 400 | ivch_read(dvo, VR8E, &val); |
400 | DRM_DEBUG("VR8E: 0x%04x\n", val); | 401 | DRM_LOG_KMS("VR8E: 0x%04x\n", val); |
401 | 402 | ||
402 | /* Scratch register 1 - Status register */ | 403 | /* Scratch register 1 - Status register */ |
403 | ivch_read(dvo, VR8F, &val); | 404 | ivch_read(dvo, VR8F, &val); |
404 | DRM_DEBUG("VR8F: 0x%04x\n", val); | 405 | DRM_LOG_KMS("VR8F: 0x%04x\n", val); |
405 | } | 406 | } |
406 | 407 | ||
407 | static void ivch_save(struct intel_dvo_device *dvo) | 408 | static void ivch_save(struct intel_dvo_device *dvo) |