1 files changed, 22 insertions, 22 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
index 0a97aeb083dd..6df7bd569495 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -723,7 +723,7 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct
                 }
 
                 if (i == ATOM_DEVICE_CV_INDEX) {
-                        DRM_DEBUG("Skipping Component Video\n");
+                        DRM_DEBUG_KMS("Skipping Component Video\n");
                         continue;
                 }
 
@@ -1095,7 +1095,7 @@ bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder,
                             (tmds_info->asMiscInfo[i].
                              ucPLL_VoltageSwing & 0xf) << 16;
 
-                        DRM_DEBUG("TMDS PLL From ATOMBIOS %u %x\n",
+                        DRM_DEBUG_KMS("TMDS PLL From ATOMBIOS %u %x\n",
                                   tmds->tmds_pll[i].freq,
                                   tmds->tmds_pll[i].value);
 
@@ -2187,11 +2187,11 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_TV1_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("TV1 connected\n");
+                        DRM_DEBUG_KMS("TV1 connected\n");
                         bios_3_scratch |= ATOM_S3_TV1_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_TV1;
                 } else {
-                        DRM_DEBUG("TV1 disconnected\n");
+                        DRM_DEBUG_KMS("TV1 disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_TV1_MASK;
                         bios_3_scratch &= ~ATOM_S3_TV1_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_TV1;
@@ -2200,11 +2200,11 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_CV_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_CV_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("CV connected\n");
+                        DRM_DEBUG_KMS("CV connected\n");
                         bios_3_scratch |= ATOM_S3_CV_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_CV;
                 } else {
-                        DRM_DEBUG("CV disconnected\n");
+                        DRM_DEBUG_KMS("CV disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_CV_MASK;
                         bios_3_scratch &= ~ATOM_S3_CV_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_CV;
@@ -2213,12 +2213,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_LCD1_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_LCD1_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("LCD1 connected\n");
+                        DRM_DEBUG_KMS("LCD1 connected\n");
                         bios_0_scratch |= ATOM_S0_LCD1;
                         bios_3_scratch |= ATOM_S3_LCD1_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_LCD1;
                 } else {
-                        DRM_DEBUG("LCD1 disconnected\n");
+                        DRM_DEBUG_KMS("LCD1 disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_LCD1;
                         bios_3_scratch &= ~ATOM_S3_LCD1_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_LCD1;
@@ -2227,12 +2227,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_CRT1_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_CRT1_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("CRT1 connected\n");
+                        DRM_DEBUG_KMS("CRT1 connected\n");
                         bios_0_scratch |= ATOM_S0_CRT1_COLOR;
                         bios_3_scratch |= ATOM_S3_CRT1_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_CRT1;
                 } else {
-                        DRM_DEBUG("CRT1 disconnected\n");
+                        DRM_DEBUG_KMS("CRT1 disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_CRT1_MASK;
                         bios_3_scratch &= ~ATOM_S3_CRT1_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_CRT1;
@@ -2241,12 +2241,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_CRT2_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_CRT2_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("CRT2 connected\n");
+                        DRM_DEBUG_KMS("CRT2 connected\n");
                         bios_0_scratch |= ATOM_S0_CRT2_COLOR;
                         bios_3_scratch |= ATOM_S3_CRT2_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_CRT2;
                 } else {
-                        DRM_DEBUG("CRT2 disconnected\n");
+                        DRM_DEBUG_KMS("CRT2 disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_CRT2_MASK;
                         bios_3_scratch &= ~ATOM_S3_CRT2_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_CRT2;
@@ -2255,12 +2255,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_DFP1_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_DFP1_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("DFP1 connected\n");
+                        DRM_DEBUG_KMS("DFP1 connected\n");
                         bios_0_scratch |= ATOM_S0_DFP1;
                         bios_3_scratch |= ATOM_S3_DFP1_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_DFP1;
                 } else {
-                        DRM_DEBUG("DFP1 disconnected\n");
+                        DRM_DEBUG_KMS("DFP1 disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_DFP1;
                         bios_3_scratch &= ~ATOM_S3_DFP1_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP1;
@@ -2269,12 +2269,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_DFP2_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_DFP2_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("DFP2 connected\n");
+                        DRM_DEBUG_KMS("DFP2 connected\n");
                         bios_0_scratch |= ATOM_S0_DFP2;
                         bios_3_scratch |= ATOM_S3_DFP2_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_DFP2;
                 } else {
-                        DRM_DEBUG("DFP2 disconnected\n");
+                        DRM_DEBUG_KMS("DFP2 disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_DFP2;
                         bios_3_scratch &= ~ATOM_S3_DFP2_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP2;
@@ -2283,12 +2283,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_DFP3_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_DFP3_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("DFP3 connected\n");
+                        DRM_DEBUG_KMS("DFP3 connected\n");
                         bios_0_scratch |= ATOM_S0_DFP3;
                         bios_3_scratch |= ATOM_S3_DFP3_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_DFP3;
                 } else {
-                        DRM_DEBUG("DFP3 disconnected\n");
+                        DRM_DEBUG_KMS("DFP3 disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_DFP3;
                         bios_3_scratch &= ~ATOM_S3_DFP3_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP3;
@@ -2297,12 +2297,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_DFP4_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_DFP4_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("DFP4 connected\n");
+                        DRM_DEBUG_KMS("DFP4 connected\n");
                         bios_0_scratch |= ATOM_S0_DFP4;
                         bios_3_scratch |= ATOM_S3_DFP4_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_DFP4;
                 } else {
-                        DRM_DEBUG("DFP4 disconnected\n");
+                        DRM_DEBUG_KMS("DFP4 disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_DFP4;
                         bios_3_scratch &= ~ATOM_S3_DFP4_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP4;
@@ -2311,12 +2311,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector,
         if ((radeon_encoder->devices & ATOM_DEVICE_DFP5_SUPPORT) &&
             (radeon_connector->devices & ATOM_DEVICE_DFP5_SUPPORT)) {
                 if (connected) {
-                        DRM_DEBUG("DFP5 connected\n");
+                        DRM_DEBUG_KMS("DFP5 connected\n");
                         bios_0_scratch |= ATOM_S0_DFP5;
                         bios_3_scratch |= ATOM_S3_DFP5_ACTIVE;
                         bios_6_scratch |= ATOM_S6_ACC_REQ_DFP5;
                 } else {
-                        DRM_DEBUG("DFP5 disconnected\n");
+                        DRM_DEBUG_KMS("DFP5 disconnected\n");
                         bios_0_scratch &= ~ATOM_S0_DFP5;
                         bios_3_scratch &= ~ATOM_S3_DFP5_ACTIVE;
                         bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP5;