diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2010-03-02 22:06:51 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-15 10:23:22 +1000 |
| commit | 839461d3b0e3082eb382f17a3e3899372f28649a (patch) | |
| tree | e34106e15420df1ef6c726e35783ae0d562fcb66 /drivers/gpu/drm/radeon/radeon_pm.c | |
| parent | 65388342d66a63a29c76058e94a00d7bc0c6423b (diff) | |
| download | kernel_samsung_aries-839461d3b0e3082eb382f17a3e3899372f28649a.zip kernel_samsung_aries-839461d3b0e3082eb382f17a3e3899372f28649a.tar.gz kernel_samsung_aries-839461d3b0e3082eb382f17a3e3899372f28649a.tar.bz2 | |
drm/radeon/kms: switch to condition waiting for reclocking
We tried to implement interruptible waiting with timeout (it was broken
anyway) which was not a good idea as explained by Andrew. It's possible
to avoid using additional variable but actually it inroduces using more
complex in-kernel tools. So simply add one variable for condition.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_pm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index d4d1c39..d800b86 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -353,10 +353,12 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev) rdev->pm.req_vblank |= (1 << 1); drm_vblank_get(rdev->ddev, 1); } - if (rdev->pm.active_crtcs) - wait_event_interruptible_timeout( - rdev->irq.vblank_queue, 0, + 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)); + } if (rdev->pm.req_vblank & (1 << 0)) { rdev->pm.req_vblank &= ~(1 << 0); drm_vblank_put(rdev->ddev, 0); |