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>

1 files changed, 15 insertions, 15 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
index 5688a0cf6bbe..b8149cbc0c70 100644
--- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c
@@ -47,7 +47,7 @@ static void radeon_legacy_lvds_dpms(struct drm_encoder *encoder, int mode)
         uint32_t lvds_gen_cntl, lvds_pll_cntl, pixclks_cntl, disp_pwr_man;
         int panel_pwr_delay = 2000;
         bool is_mac = false;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         if (radeon_encoder->enc_priv) {
                 if (rdev->is_atom_bios) {
@@ -151,7 +151,7 @@ static void radeon_legacy_lvds_mode_set(struct drm_encoder *encoder,
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         uint32_t lvds_pll_cntl, lvds_gen_cntl, lvds_ss_gen_cntl;
 
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         lvds_pll_cntl = RREG32(RADEON_LVDS_PLL_CNTL);
         lvds_pll_cntl &= ~RADEON_LVDS_PLL_EN;
@@ -167,7 +167,7 @@ static void radeon_legacy_lvds_mode_set(struct drm_encoder *encoder,
         } else {
                 struct radeon_encoder_lvds *lvds = (struct radeon_encoder_lvds *)radeon_encoder->enc_priv;
                 if (lvds) {
-                        DRM_DEBUG("bios LVDS_GEN_CNTL: 0x%x\n", lvds->lvds_gen_cntl);
+                        DRM_DEBUG_KMS("bios LVDS_GEN_CNTL: 0x%x\n", lvds->lvds_gen_cntl);
                         lvds_gen_cntl = lvds->lvds_gen_cntl;
                         lvds_ss_gen_cntl &= ~((0xf << RADEON_LVDS_PWRSEQ_DELAY1_SHIFT) |
                                               (0xf << RADEON_LVDS_PWRSEQ_DELAY2_SHIFT));
@@ -250,7 +250,7 @@ static void radeon_legacy_primary_dac_dpms(struct drm_encoder *encoder, int mode
         uint32_t dac_cntl = RREG32(RADEON_DAC_CNTL);
         uint32_t dac_macro_cntl = RREG32(RADEON_DAC_MACRO_CNTL);
 
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         switch (mode) {
         case DRM_MODE_DPMS_ON:
@@ -315,7 +315,7 @@ static void radeon_legacy_primary_dac_mode_set(struct drm_encoder *encoder,
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         uint32_t disp_output_cntl, dac_cntl, dac2_cntl, dac_macro_cntl;
 
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         if (radeon_crtc->crtc_id == 0) {
                 if (rdev->family == CHIP_R200 || ASIC_IS_R300(rdev)) {
@@ -446,7 +446,7 @@ static void radeon_legacy_tmds_int_dpms(struct drm_encoder *encoder, int mode)
         struct drm_device *dev = encoder->dev;
         struct radeon_device *rdev = dev->dev_private;
         uint32_t fp_gen_cntl = RREG32(RADEON_FP_GEN_CNTL);
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         switch (mode) {
         case DRM_MODE_DPMS_ON:
@@ -502,7 +502,7 @@ static void radeon_legacy_tmds_int_mode_set(struct drm_encoder *encoder,
         uint32_t tmp, tmds_pll_cntl, tmds_transmitter_cntl, fp_gen_cntl;
         int i;
 
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         tmp = tmds_pll_cntl = RREG32(RADEON_TMDS_PLL_CNTL);
         tmp &= 0xfffff;
@@ -610,7 +610,7 @@ static void radeon_legacy_tmds_ext_dpms(struct drm_encoder *encoder, int mode)
         struct drm_device *dev = encoder->dev;
         struct radeon_device *rdev = dev->dev_private;
         uint32_t fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL);
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         switch (mode) {
         case DRM_MODE_DPMS_ON:
@@ -666,7 +666,7 @@ static void radeon_legacy_tmds_ext_mode_set(struct drm_encoder *encoder,
         struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
         uint32_t fp2_gen_cntl;
 
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         if (rdev->is_atom_bios) {
                 radeon_encoder->pixel_clock = adjusted_mode->clock;
@@ -760,7 +760,7 @@ static void radeon_legacy_tv_dac_dpms(struct drm_encoder *encoder, int mode)
         uint32_t fp2_gen_cntl = 0, crtc2_gen_cntl = 0, tv_dac_cntl = 0;
         uint32_t tv_master_cntl = 0;
         bool is_tv;
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         is_tv = radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT ? true : false;
 
@@ -878,7 +878,7 @@ static void radeon_legacy_tv_dac_mode_set(struct drm_encoder *encoder,
         uint32_t disp_hw_debug = 0, fp2_gen_cntl = 0, disp_tv_out_cntl = 0;
         bool is_tv = false;
 
-        DRM_DEBUG("\n");
+        DRM_DEBUG_KMS("\n");
 
         is_tv = radeon_encoder->active_device & ATOM_DEVICE_TV_SUPPORT ? true : false;
 
@@ -1075,10 +1075,10 @@ static bool r300_legacy_tv_detect(struct drm_encoder *encoder,
         tmp = RREG32(RADEON_TV_DAC_CNTL);
         if ((tmp & RADEON_TV_DAC_GDACDET) != 0) {
                 found = true;
-                DRM_DEBUG("S-video TV connection detected\n");
+                DRM_DEBUG_KMS("S-video TV connection detected\n");
         } else if ((tmp & RADEON_TV_DAC_BDACDET) != 0) {
                 found = true;
-                DRM_DEBUG("Composite TV connection detected\n");
+                DRM_DEBUG_KMS("Composite TV connection detected\n");
         }
 
         WREG32(RADEON_TV_DAC_CNTL, tv_dac_cntl);
@@ -1141,10 +1141,10 @@ static bool radeon_legacy_tv_detect(struct drm_encoder *encoder,
         tmp = RREG32(RADEON_TV_DAC_CNTL);
         if (tmp & RADEON_TV_DAC_GDACDET) {
                 found = true;
-                DRM_DEBUG("S-video TV connection detected\n");
+                DRM_DEBUG_KMS("S-video TV connection detected\n");
         } else if ((tmp & RADEON_TV_DAC_BDACDET) != 0) {
                 found = true;
-                DRM_DEBUG("Composite TV connection detected\n");
+                DRM_DEBUG_KMS("Composite TV connection detected\n");
         }
 
         WREG32(RADEON_TV_PRE_DAC_MUX_CNTL, tv_pre_dac_mux_cntl);