Merge remote branch 'intel/drm-intel-next' of /ssd/git/drm-next into drm-core-next
[sfrench/cifs-2.6.git] / drivers / gpu / drm / radeon / radeon_pm.c
index 07579ae2ab68499228ae241955b1700de75d5717..95f8b3a3c43d993ee6eac9ea3a713b5aa35d3935 100644 (file)
@@ -62,9 +62,9 @@ static int radeon_acpi_event(struct notifier_block *nb,
 
        if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {
                if (power_supply_is_system_supplied() > 0)
-                       DRM_DEBUG("pm: AC\n");
+                       DRM_DEBUG_DRIVER("pm: AC\n");
                else
-                       DRM_DEBUG("pm: DC\n");
+                       DRM_DEBUG_DRIVER("pm: DC\n");
 
                if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
                        if (rdev->pm.profile == PM_PROFILE_AUTO) {
@@ -198,7 +198,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
                        radeon_set_engine_clock(rdev, sclk);
                        radeon_pm_debug_check_in_vbl(rdev, true);
                        rdev->pm.current_sclk = sclk;
-                       DRM_DEBUG("Setting: e: %d\n", sclk);
+                       DRM_DEBUG_DRIVER("Setting: e: %d\n", sclk);
                }
 
                /* set memory clock */
@@ -207,7 +207,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
                        radeon_set_memory_clock(rdev, mclk);
                        radeon_pm_debug_check_in_vbl(rdev, true);
                        rdev->pm.current_mclk = mclk;
-                       DRM_DEBUG("Setting: m: %d\n", mclk);
+                       DRM_DEBUG_DRIVER("Setting: m: %d\n", mclk);
                }
 
                if (misc_after)
@@ -219,7 +219,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
                rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index;
                rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index;
        } else
-               DRM_DEBUG("pm: GUI not idle!!!\n");
+               DRM_DEBUG_DRIVER("pm: GUI not idle!!!\n");
 }
 
 static void radeon_pm_set_clocks(struct radeon_device *rdev)
@@ -294,27 +294,27 @@ static void radeon_pm_print_states(struct radeon_device *rdev)
        struct radeon_power_state *power_state;
        struct radeon_pm_clock_info *clock_info;
 
-       DRM_DEBUG("%d Power State(s)\n", rdev->pm.num_power_states);
+       DRM_DEBUG_DRIVER("%d Power State(s)\n", rdev->pm.num_power_states);
        for (i = 0; i < rdev->pm.num_power_states; i++) {
                power_state = &rdev->pm.power_state[i];
-               DRM_DEBUG("State %d: %s\n", i,
+               DRM_DEBUG_DRIVER("State %d: %s\n", i,
                        radeon_pm_state_type_name[power_state->type]);
                if (i == rdev->pm.default_power_state_index)
-                       DRM_DEBUG("\tDefault");
+                       DRM_DEBUG_DRIVER("\tDefault");
                if ((rdev->flags & RADEON_IS_PCIE) && !(rdev->flags & RADEON_IS_IGP))
-                       DRM_DEBUG("\t%d PCIE Lanes\n", power_state->pcie_lanes);
+                       DRM_DEBUG_DRIVER("\t%d PCIE Lanes\n", power_state->pcie_lanes);
                if (power_state->flags & RADEON_PM_STATE_SINGLE_DISPLAY_ONLY)
-                       DRM_DEBUG("\tSingle display only\n");
-               DRM_DEBUG("\t%d Clock Mode(s)\n", power_state->num_clock_modes);
+                       DRM_DEBUG_DRIVER("\tSingle display only\n");
+               DRM_DEBUG_DRIVER("\t%d Clock Mode(s)\n", power_state->num_clock_modes);
                for (j = 0; j < power_state->num_clock_modes; j++) {
                        clock_info = &(power_state->clock_info[j]);
                        if (rdev->flags & RADEON_IS_IGP)
-                               DRM_DEBUG("\t\t%d e: %d%s\n",
+                               DRM_DEBUG_DRIVER("\t\t%d e: %d%s\n",
                                        j,
                                        clock_info->sclk * 10,
                                        clock_info->flags & RADEON_PM_MODE_NO_DISPLAY ? "\tNo display only" : "");
                        else
-                               DRM_DEBUG("\t\t%d e: %d\tm: %d\tv: %d%s\n",
+                               DRM_DEBUG_DRIVER("\t\t%d e: %d\tm: %d\tv: %d%s\n",
                                        j,
                                        clock_info->sclk * 10,
                                        clock_info->mclk * 10,
@@ -658,7 +658,7 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev)
                                        radeon_pm_get_dynpm_state(rdev);
                                        radeon_pm_set_clocks(rdev);
 
-                                       DRM_DEBUG("radeon: dynamic power management deactivated\n");
+                                       DRM_DEBUG_DRIVER("radeon: dynamic power management deactivated\n");
                                }
                        } else if (rdev->pm.active_crtc_count == 1) {
                                /* TODO: Increase clocks if needed for current mode */
@@ -675,7 +675,7 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev)
                                        rdev->pm.dynpm_state = DYNPM_STATE_ACTIVE;
                                        queue_delayed_work(rdev->wq, &rdev->pm.dynpm_idle_work,
                                                           msecs_to_jiffies(RADEON_IDLE_LOOP_MS));
-                                       DRM_DEBUG("radeon: dynamic power management activated\n");
+                                       DRM_DEBUG_DRIVER("radeon: dynamic power management activated\n");
                                }
                        } else { /* count == 0 */
                                if (rdev->pm.dynpm_state != DYNPM_STATE_MINIMUM) {
@@ -771,7 +771,7 @@ static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish
        bool in_vbl = radeon_pm_in_vbl(rdev);
 
        if (in_vbl == false)
-               DRM_DEBUG("not in vbl for pm change %08x at %s\n", stat_crtc,
+               DRM_DEBUG_DRIVER("not in vbl for pm change %08x at %s\n", stat_crtc,
                         finish ? "exit" : "entry");
        return in_vbl;
 }