Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce8a3eb2 authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms/pm: make pm spam debug only

parent ce8f5370
Loading
Loading
Loading
Loading
+8 −8
Original line number Original line Diff line number Diff line
@@ -141,7 +141,7 @@ void r100_pm_get_dynpm_state(struct radeon_device *rdev)
	/* only one clock mode per power state */
	/* only one clock mode per power state */
	rdev->pm.requested_clock_mode_index = 0;
	rdev->pm.requested_clock_mode_index = 0;


	DRM_INFO("Requested: e: %d m: %d p: %d\n",
	DRM_DEBUG("Requested: e: %d m: %d p: %d\n",
		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
		  clock_info[rdev->pm.requested_clock_mode_index].sclk,
		  clock_info[rdev->pm.requested_clock_mode_index].sclk,
		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
@@ -266,7 +266,7 @@ void r100_pm_misc(struct radeon_device *rdev)
	     rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) {
	     rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) {
		radeon_set_pcie_lanes(rdev,
		radeon_set_pcie_lanes(rdev,
				      ps->pcie_lanes);
				      ps->pcie_lanes);
		DRM_INFO("Setting: p: %d\n", ps->pcie_lanes);
		DRM_DEBUG("Setting: p: %d\n", ps->pcie_lanes);
	}
	}
}
}


+7 −7
Original line number Original line Diff line number Diff line
@@ -251,7 +251,7 @@ void r600_pm_get_dynpm_state(struct radeon_device *rdev)
		}
		}
	}
	}


	DRM_INFO("Requested: e: %d m: %d p: %d\n",
	DRM_DEBUG("Requested: e: %d m: %d p: %d\n",
		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
		  clock_info[rdev->pm.requested_clock_mode_index].sclk,
		  clock_info[rdev->pm.requested_clock_mode_index].sclk,
		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
+8 −8
Original line number Original line Diff line number Diff line
@@ -52,9 +52,9 @@ static int radeon_acpi_event(struct notifier_block *nb,


	if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {
	if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {
		if (power_supply_is_system_supplied() > 0)
		if (power_supply_is_system_supplied() > 0)
			DRM_INFO("pm: AC\n");
			DRM_DEBUG("pm: AC\n");
		else
		else
			DRM_INFO("pm: DC\n");
			DRM_DEBUG("pm: DC\n");


		if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
		if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
			if (rdev->pm.profile == PM_PROFILE_AUTO) {
			if (rdev->pm.profile == PM_PROFILE_AUTO) {
@@ -183,7 +183,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
				radeon_set_engine_clock(rdev, sclk);
				radeon_set_engine_clock(rdev, sclk);
				radeon_pm_debug_check_in_vbl(rdev, true);
				radeon_pm_debug_check_in_vbl(rdev, true);
				rdev->pm.current_sclk = sclk;
				rdev->pm.current_sclk = sclk;
				DRM_INFO("Setting: e: %d\n", sclk);
				DRM_DEBUG("Setting: e: %d\n", sclk);
			}
			}


			/* set memory clock */
			/* set memory clock */
@@ -192,7 +192,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
				radeon_set_memory_clock(rdev, mclk);
				radeon_set_memory_clock(rdev, mclk);
				radeon_pm_debug_check_in_vbl(rdev, true);
				radeon_pm_debug_check_in_vbl(rdev, true);
				rdev->pm.current_mclk = mclk;
				rdev->pm.current_mclk = mclk;
				DRM_INFO("Setting: m: %d\n", mclk);
				DRM_DEBUG("Setting: m: %d\n", mclk);
			}
			}
			radeon_pm_finish(rdev);
			radeon_pm_finish(rdev);
		} else {
		} else {
@@ -203,7 +203,7 @@ static void radeon_set_power_state(struct radeon_device *rdev)
				radeon_set_engine_clock(rdev, sclk);
				radeon_set_engine_clock(rdev, sclk);
				radeon_pm_finish(rdev);
				radeon_pm_finish(rdev);
				rdev->pm.current_sclk = sclk;
				rdev->pm.current_sclk = sclk;
				DRM_INFO("Setting: e: %d\n", sclk);
				DRM_DEBUG("Setting: e: %d\n", sclk);
			}
			}
			/* set memory clock */
			/* set memory clock */
			if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) {
			if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) {
@@ -212,14 +212,14 @@ static void radeon_set_power_state(struct radeon_device *rdev)
				radeon_set_memory_clock(rdev, mclk);
				radeon_set_memory_clock(rdev, mclk);
				radeon_pm_finish(rdev);
				radeon_pm_finish(rdev);
				rdev->pm.current_mclk = mclk;
				rdev->pm.current_mclk = mclk;
				DRM_INFO("Setting: m: %d\n", mclk);
				DRM_DEBUG("Setting: m: %d\n", mclk);
			}
			}
		}
		}


		rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index;
		rdev->pm.current_power_state_index = rdev->pm.requested_power_state_index;
		rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index;
		rdev->pm.current_clock_mode_index = rdev->pm.requested_clock_mode_index;
	} else
	} else
		DRM_INFO("pm: GUI not idle!!!\n");
		DRM_DEBUG("pm: GUI not idle!!!\n");
}
}


static void radeon_pm_set_clocks(struct radeon_device *rdev)
static void radeon_pm_set_clocks(struct radeon_device *rdev)
@@ -624,7 +624,7 @@ static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish
	bool in_vbl = radeon_pm_in_vbl(rdev);
	bool in_vbl = radeon_pm_in_vbl(rdev);


	if (in_vbl == false)
	if (in_vbl == false)
		DRM_INFO("not in vbl for pm change %08x at %s\n", stat_crtc,
		DRM_DEBUG("not in vbl for pm change %08x at %s\n", stat_crtc,
			 finish ? "exit" : "entry");
			 finish ? "exit" : "entry");
	return in_vbl;
	return in_vbl;
}
}
+1 −1
Original line number Original line Diff line number Diff line
@@ -135,7 +135,7 @@ void rs600_pm_misc(struct radeon_device *rdev)
	     rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) {
	     rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) {
		radeon_set_pcie_lanes(rdev,
		radeon_set_pcie_lanes(rdev,
				      ps->pcie_lanes);
				      ps->pcie_lanes);
		DRM_INFO("Setting: p: %d\n", ps->pcie_lanes);
		DRM_DEBUG("Setting: p: %d\n", ps->pcie_lanes);
	}
	}
}
}