WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/radeon_pm.c

  * OTHER DEALINGS IN THE SOFTWARE.
+ *
  * Authors: Rafał Miłecki
  *          Alex Deucher
  */
-#include "drmP.h"
+#include
 #include "radeon.h"
 #include "avivod.h"
 #include "atom.h"
 #define DRM_DEBUG_DRIVER(fmt, args...)
 #define RADEON_IDLE_LOOP_MS 100
-#define RADEON_RECLOCK_DELAY_MS 200
-#define RADEON_WAIT_VBLANK_TIMEOUT 200
+#define RADEON_RECLOCK_DELAY_MS 200
-#define RADEON_WAIT_IDLE_TIMEOUT 200
+#define RADEON_WAIT_VBLANK_TIMEOUT 200
 static const char *radeon_pm_state_type_name[5] = {
-	"Default",
+	"",
 	"Powersave",
 	"Battery",
 static bool radeon_pm_in_vbl(struct radeon_device *rdev);
 static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish);
 static void radeon_pm_update_profile(struct radeon_device *rdev);
 static void radeon_pm_set_clocks(struct radeon_device *rdev);
-static inline int power_supply_is_system_supplied(void) { return -ENOSYS; }
-#define ACPI_AC_CLASS           "ac_adapter"
-#ifdef CONFIG_ACPI
-static int radeon_acpi_event(struct notifier_block *nb,
+int radeon_pm_get_type_index(struct radeon_device *rdev,
-			     unsigned long val,
+			     enum radeon_pm_state_type ps_type,
-			     void *data)
+			     int instance)
 {
-	struct radeon_device *rdev = container_of(nb, struct radeon_device, acpi_nb);
+	int i;
-	struct acpi_bus_event *entry = (struct acpi_bus_event *)data;
+	int found_instance = -1;
+	for (i = 0; i < rdev->pm.num_power_states; i++) {
-	if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {
+		if (rdev->pm.power_state[i].type == ps_type) {
+			found_instance++;
-		if (power_supply_is_system_supplied() > 0)
+			if (found_instance == instance)
+				return i;
-			DRM_DEBUG_DRIVER("pm: AC\n");
+		}
+	}
+	/* return default if no match */
+	return rdev->pm.default_power_state_index;
+}
 		else
-			DRM_DEBUG_DRIVER("pm: DC\n");
+void radeon_pm_acpi_event_handler(struct radeon_device *rdev)
+{
 		if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
 			if (rdev->pm.profile == PM_PROFILE_AUTO) {
 				mutex_lock(&rdev->pm.mutex);
 				radeon_pm_update_profile(rdev);
 				radeon_pm_set_clocks(rdev);
 				mutex_unlock(&rdev->pm.mutex);
-		}
-	}
-	}
 	return NOTIFY_OK;
+	}
 #endif
 static void radeon_pm_update_profile(struct radeon_device *rdev)
 	if (list_empty(&rdev->gem.objects))
 		return;
+}
+static void radeon_sync_with_vblank(struct radeon_device *rdev)
+{
+	if (rdev->pm.active_crtcs) {
+		rdev->pm.vblank_sync = false;
+//       wait_event_timeout(
+//           rdev->irq.vblank_queue, rdev->pm.vblank_sync,
+//           msecs_to_jiffies(RADEON_WAIT_VBLANK_TIMEOUT));
+    }
+}
 static void radeon_set_power_state(struct radeon_device *rdev)
 		sclk = rdev->pm.power_state[rdev->pm.requested_power_state_index].
 			clock_info[rdev->pm.requested_clock_mode_index].sclk;
 		if (sclk > rdev->pm.default_sclk)
 			sclk = rdev->pm.default_sclk;
+		/* starting with BTC, there is one state that is used for both
+		 * MH and SH.  Difference is that we always use the high clock index for
+		 * mclk.
+		 */
+		if ((rdev->pm.pm_method == PM_METHOD_PROFILE) &&
+		    (rdev->family >= CHIP_BARTS) &&
+		    rdev->pm.active_crtc_count &&
+		    ((rdev->pm.profile_index == PM_PROFILE_MID_MH_IDX) ||
+		     (rdev->pm.profile_index == PM_PROFILE_LOW_MH_IDX)))
+			mclk = rdev->pm.power_state[rdev->pm.requested_power_state_index].
+				clock_info[rdev->pm.profiles[PM_PROFILE_HIGH_MH_IDX].dpms_on_cm_idx].mclk;
 		else
 		mclk = rdev->pm.power_state[rdev->pm.requested_power_state_index].
+			clock_info[rdev->pm.requested_clock_mode_index].mclk;
 			clock_info[rdev->pm.requested_clock_mode_index].mclk;
 		if (mclk > rdev->pm.default_mclk)
 			mclk = rdev->pm.default_mclk;
 		/* upvolt before raising clocks, downvolt after lowering clocks */
 		if (sclk < rdev->pm.current_sclk)
 			misc_after = true;
-//       radeon_sync_with_vblank(rdev);
+		radeon_sync_with_vblank(rdev);
 			rdev->pm.current_sclk = sclk;
 			DRM_DEBUG_DRIVER("Setting: e: %d\n", sclk);
+		}
 	/* set memory clock */
-		if (rdev->asic->set_memory_clock && (mclk != rdev->pm.current_mclk)) {
+		if (rdev->asic->pm.set_memory_clock && (mclk != rdev->pm.current_mclk)) {
 		radeon_pm_debug_check_in_vbl(rdev, false);
 			radeon_set_memory_clock(rdev, mclk);
 		radeon_pm_debug_check_in_vbl(rdev, true);
 			rdev->pm.current_mclk = mclk;
 	if ((rdev->pm.requested_clock_mode_index == rdev->pm.current_clock_mode_index) &&
 	    (rdev->pm.requested_power_state_index == rdev->pm.current_power_state_index))
 		return;
 	mutex_lock(&rdev->ddev->struct_mutex);
-	mutex_lock(&rdev->vram_mutex);
+//   down_write(&rdev->pm.mclk_lock);
-	mutex_lock(&rdev->cp.mutex);
-	/* gui idle int has issues on older chips it seems */
-	if (rdev->family >= CHIP_R600) {
+	mutex_lock(&rdev->ring_lock);
-		if (rdev->irq.installed) {
-			/* wait for GPU idle */
+	/* wait for the rings to drain */
-			rdev->pm.gui_idle = false;
-			rdev->irq.gui_idle = true;
-        }
+	for (i = 0; i < RADEON_NUM_RINGS; i++) {
-	} else {
-		if (rdev->cp.ready) {
-//           struct radeon_fence *fence;
-//           radeon_ring_alloc(rdev, 64);
-//           radeon_fence_create(rdev, &fence);
-//           radeon_fence_emit(rdev, fence);
+		struct radeon_ring *ring = &rdev->ring[i];
-//           radeon_ring_commit(rdev);
-//           radeon_fence_wait(fence, false);
-//           radeon_fence_unref(&fence);
+		if (ring->ready)
+			radeon_fence_wait_empty_locked(rdev, i);
+	}
 	radeon_unmap_vram_bos(rdev);
 	if (rdev->pm.active_crtc_count)
 		radeon_bandwidth_update(rdev);
 	rdev->pm.dynpm_planned_action = DYNPM_ACTION_NONE;
-	mutex_unlock(&rdev->cp.mutex);
+	mutex_unlock(&rdev->ring_lock);
-	mutex_unlock(&rdev->vram_mutex);
+//   up_write(&rdev->pm.mclk_lock);
 	mutex_unlock(&rdev->ddev->struct_mutex);
+}
 			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_DRIVER("\t\t%d e: %d%s\n",
+				DRM_DEBUG_DRIVER("\t\t%d e: %d\n",
 					j,
-					clock_info->sclk * 10,
+						 clock_info->sclk * 10);
-					clock_info->flags & RADEON_PM_MODE_NO_DISPLAY ? "\tNo display only" : "");
 			else
-				DRM_DEBUG_DRIVER("\t\t%d e: %d\tm: %d\tv: %d%s\n",
+				DRM_DEBUG_DRIVER("\t\t%d e: %d\tm: %d\tv: %d\n",
 					j,
 					clock_info->sclk * 10,
 					clock_info->mclk * 10,
-					clock_info->voltage.voltage,
+						 clock_info->voltage.voltage);
-					clock_info->flags & RADEON_PM_MODE_NO_DISPLAY ? "\tNo display only" : "");
+		}
+	}
+}
 static ssize_t radeon_get_pm_profile(struct device *dev,
 				     struct device_attribute *attr,
 				     char *buf)
+{
+	struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev));
+	struct radeon_device *rdev = ddev->dev_private;
-{
+	int cp = rdev->pm.profile;
+	return snprintf(buf, PAGE_SIZE, "%s\n",
+			(cp == PM_PROFILE_AUTO) ? "auto" :
+			(cp == PM_PROFILE_LOW) ? "low" :
 			(cp == PM_PROFILE_MID) ? "mid" :
-    return snprintf(buf, PAGE_SIZE, "%s\n", "default");
+			(cp == PM_PROFILE_HIGH) ? "high" : "default");
+}
+{
 	struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev));
 	struct radeon_device *rdev = ddev->dev_private;
-	mutex_lock(&rdev->pm.mutex);
+	mutex_lock(&rdev->pm.mutex);
+	if (rdev->pm.pm_method == PM_METHOD_PROFILE) {
 		if (strncmp("default", buf, strlen("default")) == 0)
+    rdev->pm.profile = PM_PROFILE_DEFAULT;
+		else if (strncmp("auto", buf, strlen("auto")) == 0)
+			rdev->pm.profile = PM_PROFILE_AUTO;
+		else if (strncmp("low", buf, strlen("low")) == 0)
+			rdev->pm.profile = PM_PROFILE_LOW;
+		else if (strncmp("mid", buf, strlen("mid")) == 0)
+			rdev->pm.profile = PM_PROFILE_MID;
+		else if (strncmp("high", buf, strlen("high")) == 0)
+			rdev->pm.profile = PM_PROFILE_HIGH;
+		else {
+			count = -EINVAL;
-    rdev->pm.profile = PM_PROFILE_DEFAULT;
+			goto fail;
+		}
     radeon_pm_update_profile(rdev);
+    radeon_pm_set_clocks(rdev);
+	} else
+		count = -EINVAL;
     radeon_pm_set_clocks(rdev);
 fail:
 	mutex_unlock(&rdev->pm.mutex);
 		rdev->pm.dynpm_planned_action = DYNPM_ACTION_NONE;
 		rdev->pm.pm_method = PM_METHOD_PROFILE;
 		mutex_unlock(&rdev->pm.mutex);
 //		cancel_delayed_work_sync(&rdev->pm.dynpm_idle_work);
 	} else {
-		DRM_ERROR("invalid power method!\n");
+		count = -EINVAL;
 		goto fail;
+	}
 	radeon_pm_compute_clocks(rdev);
 fail:
 	return count;
+}
+//static DEVICE_ATTR(power_profile, S_IRUGO | S_IWUSR, radeon_get_pm_profile, radeon_set_pm_profile);
+//static DEVICE_ATTR(power_method, S_IRUGO | S_IWUSR, radeon_get_pm_method, radeon_set_pm_method);
 static ssize_t radeon_hwmon_show_temp(struct device *dev,
 				      struct device_attribute *attr,
 				      char *buf)
+{
 	struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev));
 	struct radeon_device *rdev = ddev->dev_private;
-	u32 temp;
+	int temp;
 	switch (rdev->pm.int_thermal_type) {
 	case THERMAL_TYPE_RV6XX:
 		break;
 	case THERMAL_TYPE_EVERGREEN:
 	case THERMAL_TYPE_NI:
 		temp = evergreen_get_temp(rdev);
 		break;
+	case THERMAL_TYPE_SUMO:
+		temp = sumo_get_temp(rdev);
+		break;
+	case THERMAL_TYPE_SI:
+		temp = si_get_temp(rdev);
+		break;
 	default:
 		temp = 0;
 		break;
+	}

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_pm.c – Rev 1986 → 2997