diff options
author | Zhao Yakui <yakui.zhao@intel.com> | 2009-10-08 23:39:40 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-11-05 17:47:10 -0500 |
commit | 44d98a614267c81a04ba9c7a0427c3a628985b7d (patch) | |
tree | 4a730abbdd317c106ce0f50565cb8c0eb4c836d8 /drivers/gpu/drm/i915/i915_opregion.c | |
parent | 5c5a4359fe392b52b444134877fc4002be542b42 (diff) |
drm/i915: Replace DRM_DEBUG with DRM_DEBUG_DRIVER
Replace the DRM_DEBUG with DRM_DEBUG_DRIVER in generic i915 driver.
Then the debug info can be obtained by adding the boot option of
"drm.debug=0x02".
At the same time the debug info in increase/decrease clock is also
printed by using DRM_DEBUG_DRIVER instead of DRM_DEBUG_KMS.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_opregion.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_opregion.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c index 2d5193556d3f..9032bda35e2a 100644 --- a/drivers/gpu/drm/i915/i915_opregion.c +++ b/drivers/gpu/drm/i915/i915_opregion.c | |||
@@ -224,7 +224,7 @@ void opregion_asle_intr(struct drm_device *dev) | |||
224 | asle_req = asle->aslc & ASLE_REQ_MSK; | 224 | asle_req = asle->aslc & ASLE_REQ_MSK; |
225 | 225 | ||
226 | if (!asle_req) { | 226 | if (!asle_req) { |
227 | DRM_DEBUG("non asle set request??\n"); | 227 | DRM_DEBUG_DRIVER("non asle set request??\n"); |
228 | return; | 228 | return; |
229 | } | 229 | } |
230 | 230 | ||
@@ -361,9 +361,9 @@ int intel_opregion_init(struct drm_device *dev, int resume) | |||
361 | int err = 0; | 361 | int err = 0; |
362 | 362 | ||
363 | pci_read_config_dword(dev->pdev, PCI_ASLS, &asls); | 363 | pci_read_config_dword(dev->pdev, PCI_ASLS, &asls); |
364 | DRM_DEBUG("graphic opregion physical addr: 0x%x\n", asls); | 364 | DRM_DEBUG_DRIVER("graphic opregion physical addr: 0x%x\n", asls); |
365 | if (asls == 0) { | 365 | if (asls == 0) { |
366 | DRM_DEBUG("ACPI OpRegion not supported!\n"); | 366 | DRM_DEBUG_DRIVER("ACPI OpRegion not supported!\n"); |
367 | return -ENOTSUPP; | 367 | return -ENOTSUPP; |
368 | } | 368 | } |
369 | 369 | ||
@@ -373,30 +373,30 @@ int intel_opregion_init(struct drm_device *dev, int resume) | |||
373 | 373 | ||
374 | opregion->header = base; | 374 | opregion->header = base; |
375 | if (memcmp(opregion->header->signature, OPREGION_SIGNATURE, 16)) { | 375 | if (memcmp(opregion->header->signature, OPREGION_SIGNATURE, 16)) { |
376 | DRM_DEBUG("opregion signature mismatch\n"); | 376 | DRM_DEBUG_DRIVER("opregion signature mismatch\n"); |
377 | err = -EINVAL; | 377 | err = -EINVAL; |
378 | goto err_out; | 378 | goto err_out; |
379 | } | 379 | } |
380 | 380 | ||
381 | mboxes = opregion->header->mboxes; | 381 | mboxes = opregion->header->mboxes; |
382 | if (mboxes & MBOX_ACPI) { | 382 | if (mboxes & MBOX_ACPI) { |
383 | DRM_DEBUG("Public ACPI methods supported\n"); | 383 | DRM_DEBUG_DRIVER("Public ACPI methods supported\n"); |
384 | opregion->acpi = base + OPREGION_ACPI_OFFSET; | 384 | opregion->acpi = base + OPREGION_ACPI_OFFSET; |
385 | if (drm_core_check_feature(dev, DRIVER_MODESET)) | 385 | if (drm_core_check_feature(dev, DRIVER_MODESET)) |
386 | intel_didl_outputs(dev); | 386 | intel_didl_outputs(dev); |
387 | } else { | 387 | } else { |
388 | DRM_DEBUG("Public ACPI methods not supported\n"); | 388 | DRM_DEBUG_DRIVER("Public ACPI methods not supported\n"); |
389 | err = -ENOTSUPP; | 389 | err = -ENOTSUPP; |
390 | goto err_out; | 390 | goto err_out; |
391 | } | 391 | } |
392 | opregion->enabled = 1; | 392 | opregion->enabled = 1; |
393 | 393 | ||
394 | if (mboxes & MBOX_SWSCI) { | 394 | if (mboxes & MBOX_SWSCI) { |
395 | DRM_DEBUG("SWSCI supported\n"); | 395 | DRM_DEBUG_DRIVER("SWSCI supported\n"); |
396 | opregion->swsci = base + OPREGION_SWSCI_OFFSET; | 396 | opregion->swsci = base + OPREGION_SWSCI_OFFSET; |
397 | } | 397 | } |
398 | if (mboxes & MBOX_ASLE) { | 398 | if (mboxes & MBOX_ASLE) { |
399 | DRM_DEBUG("ASLE supported\n"); | 399 | DRM_DEBUG_DRIVER("ASLE supported\n"); |
400 | opregion->asle = base + OPREGION_ASLE_OFFSET; | 400 | opregion->asle = base + OPREGION_ASLE_OFFSET; |
401 | opregion_enable_asle(dev); | 401 | opregion_enable_asle(dev); |
402 | } | 402 | } |