diff options
author | Zhao Yakui <yakui.zhao@intel.com> | 2009-10-08 23:39:41 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-11-05 17:47:11 -0500 |
commit | 28c97730c36e06d5ba0c442156eb2154347cc3fe (patch) | |
tree | 3c5dc547eae020bf602c27dc82c83d2e14610e21 /drivers/gpu/drm/i915/intel_bios.c | |
parent | 44d98a614267c81a04ba9c7a0427c3a628985b7d (diff) |
drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS
Replace the DRM_DEBUG with DRM_DEBUG_KMS in output device 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/intel_bios.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 96cd256e60e6..cbd911837b08 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c | |||
@@ -159,7 +159,7 @@ parse_lfp_panel_data(struct drm_i915_private *dev_priv, | |||
159 | 159 | ||
160 | dev_priv->lfp_lvds_vbt_mode = panel_fixed_mode; | 160 | dev_priv->lfp_lvds_vbt_mode = panel_fixed_mode; |
161 | 161 | ||
162 | DRM_DEBUG("Found panel mode in BIOS VBT tables:\n"); | 162 | DRM_DEBUG_KMS("Found panel mode in BIOS VBT tables:\n"); |
163 | drm_mode_debug_printmodeline(panel_fixed_mode); | 163 | drm_mode_debug_printmodeline(panel_fixed_mode); |
164 | 164 | ||
165 | return; | 165 | return; |
@@ -250,13 +250,13 @@ parse_general_definitions(struct drm_i915_private *dev_priv, | |||
250 | u16 block_size = get_blocksize(general); | 250 | u16 block_size = get_blocksize(general); |
251 | if (block_size >= sizeof(*general)) { | 251 | if (block_size >= sizeof(*general)) { |
252 | int bus_pin = general->crt_ddc_gmbus_pin; | 252 | int bus_pin = general->crt_ddc_gmbus_pin; |
253 | DRM_DEBUG("crt_ddc_bus_pin: %d\n", bus_pin); | 253 | DRM_DEBUG_KMS("crt_ddc_bus_pin: %d\n", bus_pin); |
254 | if ((bus_pin >= 1) && (bus_pin <= 6)) { | 254 | if ((bus_pin >= 1) && (bus_pin <= 6)) { |
255 | dev_priv->crt_ddc_bus = | 255 | dev_priv->crt_ddc_bus = |
256 | crt_bus_map_table[bus_pin-1]; | 256 | crt_bus_map_table[bus_pin-1]; |
257 | } | 257 | } |
258 | } else { | 258 | } else { |
259 | DRM_DEBUG("BDB_GD too small (%d). Invalid.\n", | 259 | DRM_DEBUG_KMS("BDB_GD too small (%d). Invalid.\n", |
260 | block_size); | 260 | block_size); |
261 | } | 261 | } |
262 | } | 262 | } |
@@ -274,7 +274,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv, | |||
274 | 274 | ||
275 | p_defs = find_section(bdb, BDB_GENERAL_DEFINITIONS); | 275 | p_defs = find_section(bdb, BDB_GENERAL_DEFINITIONS); |
276 | if (!p_defs) { | 276 | if (!p_defs) { |
277 | DRM_DEBUG("No general definition block is found\n"); | 277 | DRM_DEBUG_KMS("No general definition block is found\n"); |
278 | return; | 278 | return; |
279 | } | 279 | } |
280 | /* judge whether the size of child device meets the requirements. | 280 | /* judge whether the size of child device meets the requirements. |
@@ -284,7 +284,7 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv, | |||
284 | */ | 284 | */ |
285 | if (p_defs->child_dev_size != sizeof(*p_child)) { | 285 | if (p_defs->child_dev_size != sizeof(*p_child)) { |
286 | /* different child dev size . Ignore it */ | 286 | /* different child dev size . Ignore it */ |
287 | DRM_DEBUG("different child size is found. Invalid.\n"); | 287 | DRM_DEBUG_KMS("different child size is found. Invalid.\n"); |
288 | return; | 288 | return; |
289 | } | 289 | } |
290 | /* get the block size of general definitions */ | 290 | /* get the block size of general definitions */ |
@@ -310,11 +310,11 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv, | |||
310 | if (p_child->dvo_port != DEVICE_PORT_DVOB && | 310 | if (p_child->dvo_port != DEVICE_PORT_DVOB && |
311 | p_child->dvo_port != DEVICE_PORT_DVOC) { | 311 | p_child->dvo_port != DEVICE_PORT_DVOC) { |
312 | /* skip the incorrect SDVO port */ | 312 | /* skip the incorrect SDVO port */ |
313 | DRM_DEBUG("Incorrect SDVO port. Skip it \n"); | 313 | DRM_DEBUG_KMS("Incorrect SDVO port. Skip it \n"); |
314 | continue; | 314 | continue; |
315 | } | 315 | } |
316 | DRM_DEBUG("the SDVO device with slave addr %2x is found on " | 316 | DRM_DEBUG_KMS("the SDVO device with slave addr %2x is found on" |
317 | "%s port\n", | 317 | " %s port\n", |
318 | p_child->slave_addr, | 318 | p_child->slave_addr, |
319 | (p_child->dvo_port == DEVICE_PORT_DVOB) ? | 319 | (p_child->dvo_port == DEVICE_PORT_DVOB) ? |
320 | "SDVOB" : "SDVOC"); | 320 | "SDVOB" : "SDVOC"); |
@@ -325,21 +325,21 @@ parse_sdvo_device_mapping(struct drm_i915_private *dev_priv, | |||
325 | p_mapping->dvo_wiring = p_child->dvo_wiring; | 325 | p_mapping->dvo_wiring = p_child->dvo_wiring; |
326 | p_mapping->initialized = 1; | 326 | p_mapping->initialized = 1; |
327 | } else { | 327 | } else { |
328 | DRM_DEBUG("Maybe one SDVO port is shared by " | 328 | DRM_DEBUG_KMS("Maybe one SDVO port is shared by " |
329 | "two SDVO device.\n"); | 329 | "two SDVO device.\n"); |
330 | } | 330 | } |
331 | if (p_child->slave2_addr) { | 331 | if (p_child->slave2_addr) { |
332 | /* Maybe this is a SDVO device with multiple inputs */ | 332 | /* Maybe this is a SDVO device with multiple inputs */ |
333 | /* And the mapping info is not added */ | 333 | /* And the mapping info is not added */ |
334 | DRM_DEBUG("there exists the slave2_addr. Maybe this " | 334 | DRM_DEBUG_KMS("there exists the slave2_addr. Maybe this" |
335 | "is a SDVO device with multiple inputs.\n"); | 335 | " is a SDVO device with multiple inputs.\n"); |
336 | } | 336 | } |
337 | count++; | 337 | count++; |
338 | } | 338 | } |
339 | 339 | ||
340 | if (!count) { | 340 | if (!count) { |
341 | /* No SDVO device info is found */ | 341 | /* No SDVO device info is found */ |
342 | DRM_DEBUG("No SDVO device info is found in VBT\n"); | 342 | DRM_DEBUG_KMS("No SDVO device info is found in VBT\n"); |
343 | } | 343 | } |
344 | return; | 344 | return; |
345 | } | 345 | } |