diff options
author | Dave Airlie <airlied@redhat.com> | 2010-08-01 20:42:55 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-08-01 20:47:07 -0400 |
commit | d9fdaafbe912a34ef06ed569c6606fe2811f325b (patch) | |
tree | 31b4d09d5c20e20c6ab8a579f3d0801a2f94e742 /drivers/gpu/drm/radeon/r100.c | |
parent | d6486813d2d0658c34f62212ba9a64be4d01c317 (diff) |
drm/radeon/kms: move a bunch of modesetting debug to correct debug usage.
This migrates a bunch of DRM_DEBUG->DRM_DEBUG_KMS so we can get more modesetting related info without all the other ioctl handling easily.
Also the PM code moves to DRM_DEBUG_DRIVER mostly.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index e115583f84fb..4c48df464355 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
@@ -141,7 +141,7 @@ void r100_pm_get_dynpm_state(struct radeon_device *rdev) | |||
141 | /* only one clock mode per power state */ | 141 | /* only one clock mode per power state */ |
142 | rdev->pm.requested_clock_mode_index = 0; | 142 | rdev->pm.requested_clock_mode_index = 0; |
143 | 143 | ||
144 | DRM_DEBUG("Requested: e: %d m: %d p: %d\n", | 144 | DRM_DEBUG_DRIVER("Requested: e: %d m: %d p: %d\n", |
145 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. | 145 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. |
146 | clock_info[rdev->pm.requested_clock_mode_index].sclk, | 146 | clock_info[rdev->pm.requested_clock_mode_index].sclk, |
147 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. | 147 | rdev->pm.power_state[rdev->pm.requested_power_state_index]. |
@@ -276,7 +276,7 @@ void r100_pm_misc(struct radeon_device *rdev) | |||
276 | rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) { | 276 | rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) { |
277 | radeon_set_pcie_lanes(rdev, | 277 | radeon_set_pcie_lanes(rdev, |
278 | ps->pcie_lanes); | 278 | ps->pcie_lanes); |
279 | DRM_DEBUG("Setting: p: %d\n", ps->pcie_lanes); | 279 | DRM_DEBUG_DRIVER("Setting: p: %d\n", ps->pcie_lanes); |
280 | } | 280 | } |
281 | } | 281 | } |
282 | 282 | ||
@@ -849,7 +849,7 @@ static int r100_cp_init_microcode(struct radeon_device *rdev) | |||
849 | const char *fw_name = NULL; | 849 | const char *fw_name = NULL; |
850 | int err; | 850 | int err; |
851 | 851 | ||
852 | DRM_DEBUG("\n"); | 852 | DRM_DEBUG_KMS("\n"); |
853 | 853 | ||
854 | pdev = platform_device_register_simple("radeon_cp", 0, NULL, 0); | 854 | pdev = platform_device_register_simple("radeon_cp", 0, NULL, 0); |
855 | err = IS_ERR(pdev); | 855 | err = IS_ERR(pdev); |
@@ -2642,7 +2642,7 @@ int r100_set_surface_reg(struct radeon_device *rdev, int reg, | |||
2642 | flags |= pitch / 8; | 2642 | flags |= pitch / 8; |
2643 | 2643 | ||
2644 | 2644 | ||
2645 | DRM_DEBUG("writing surface %d %d %x %x\n", reg, flags, offset, offset+obj_size-1); | 2645 | DRM_DEBUG_KMS("writing surface %d %d %x %x\n", reg, flags, offset, offset+obj_size-1); |
2646 | WREG32(RADEON_SURFACE0_INFO + surf_index, flags); | 2646 | WREG32(RADEON_SURFACE0_INFO + surf_index, flags); |
2647 | WREG32(RADEON_SURFACE0_LOWER_BOUND + surf_index, offset); | 2647 | WREG32(RADEON_SURFACE0_LOWER_BOUND + surf_index, offset); |
2648 | WREG32(RADEON_SURFACE0_UPPER_BOUND + surf_index, offset + obj_size - 1); | 2648 | WREG32(RADEON_SURFACE0_UPPER_BOUND + surf_index, offset + obj_size - 1); |
@@ -3038,7 +3038,7 @@ void r100_bandwidth_update(struct radeon_device *rdev) | |||
3038 | } | 3038 | } |
3039 | #endif | 3039 | #endif |
3040 | 3040 | ||
3041 | DRM_DEBUG("GRPH_BUFFER_CNTL from to %x\n", | 3041 | DRM_DEBUG_KMS("GRPH_BUFFER_CNTL from to %x\n", |
3042 | /* (unsigned int)info->SavedReg->grph_buffer_cntl, */ | 3042 | /* (unsigned int)info->SavedReg->grph_buffer_cntl, */ |
3043 | (unsigned int)RREG32(RADEON_GRPH_BUFFER_CNTL)); | 3043 | (unsigned int)RREG32(RADEON_GRPH_BUFFER_CNTL)); |
3044 | } | 3044 | } |
@@ -3134,7 +3134,7 @@ void r100_bandwidth_update(struct radeon_device *rdev) | |||
3134 | WREG32(RS400_DISP1_REQ_CNTL1, 0x28FBC3AC); | 3134 | WREG32(RS400_DISP1_REQ_CNTL1, 0x28FBC3AC); |
3135 | } | 3135 | } |
3136 | 3136 | ||
3137 | DRM_DEBUG("GRPH2_BUFFER_CNTL from to %x\n", | 3137 | DRM_DEBUG_KMS("GRPH2_BUFFER_CNTL from to %x\n", |
3138 | (unsigned int)RREG32(RADEON_GRPH2_BUFFER_CNTL)); | 3138 | (unsigned int)RREG32(RADEON_GRPH2_BUFFER_CNTL)); |
3139 | } | 3139 | } |
3140 | } | 3140 | } |