Skip to content

Commit

Permalink
drm/radeon/kms: get_power_state early, not when processing IRQ
Browse files Browse the repository at this point in the history
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Rafał Miłecki authored and Dave Airlie committed Feb 8, 2010
1 parent 530079a commit a0eb38e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/gpu/drm/radeon/radeon_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev)

rdev->pm.state = PM_STATE_PAUSED;
rdev->pm.planned_action = PM_ACTION_UPCLOCK;
radeon_get_power_state(rdev, rdev->pm.planned_action);
rdev->pm.vblank_callback = true;

mutex_unlock(&rdev->pm.mutex);
Expand All @@ -292,6 +293,7 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev)
if (rdev->pm.state == PM_STATE_MINIMUM) {
rdev->pm.state = PM_STATE_ACTIVE;
rdev->pm.planned_action = PM_ACTION_UPCLOCK;
radeon_get_power_state(rdev, rdev->pm.planned_action);
radeon_pm_set_clocks_locked(rdev);

queue_delayed_work(rdev->wq, &rdev->pm.idle_work,
Expand All @@ -312,6 +314,7 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev)

rdev->pm.state = PM_STATE_MINIMUM;
rdev->pm.planned_action = PM_ACTION_MINIMUM;
radeon_get_power_state(rdev, rdev->pm.planned_action);
radeon_pm_set_clocks_locked(rdev);
}

Expand All @@ -324,18 +327,14 @@ static void radeon_pm_set_clocks_locked(struct radeon_device *rdev)
/*radeon_fence_wait_last(rdev);*/
switch (rdev->pm.planned_action) {
case PM_ACTION_UPCLOCK:
radeon_get_power_state(rdev, PM_ACTION_UPCLOCK);
rdev->pm.downclocked = false;
break;
case PM_ACTION_DOWNCLOCK:
radeon_get_power_state(rdev, PM_ACTION_DOWNCLOCK);
rdev->pm.downclocked = true;
break;
case PM_ACTION_MINIMUM:
radeon_get_power_state(rdev, PM_ACTION_MINIMUM);
break;
case PM_ACTION_NONE:
radeon_get_power_state(rdev, PM_ACTION_NONE);
DRM_ERROR("%s: PM_ACTION_NONE\n", __func__);
break;
}
Expand Down Expand Up @@ -427,6 +426,7 @@ static void radeon_pm_idle_work_handler(struct work_struct *work)
rdev->pm.req_vblank |= (1 << 1);
drm_vblank_get(rdev->ddev, 1);
}
radeon_get_power_state(rdev, rdev->pm.planned_action);
rdev->pm.vblank_callback = true;
}
}
Expand Down

0 comments on commit a0eb38e

Please sign in to comment.