diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-13 19:23:01 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-13 19:23:01 -0800 |
| commit | 93c222c0e126c1c24ac454acf013f2c85e57bd8b (patch) | |
| tree | 920c429de92857aaf74e64a0f4f9fbaec7032fcf /drivers/gpu/drm/radeon/radeon_pm.c | |
| parent | f89c2b39ce676cb08b6ed8848cde76dcb21cc672 (diff) | |
| parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
| download | linux-93c222c0e126c1c24ac454acf013f2c85e57bd8b.tar.gz linux-93c222c0e126c1c24ac454acf013f2c85e57bd8b.tar.bz2 linux-93c222c0e126c1c24ac454acf013f2c85e57bd8b.zip | |
Merge 4.4-rc5 into staging-next
We want those fixes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_pm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index f4f03dcc1530..59abebd6b5dc 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c @@ -1756,7 +1756,9 @@ static bool radeon_pm_in_vbl(struct radeon_device *rdev) */ for (crtc = 0; (crtc < rdev->num_crtc) && in_vbl; crtc++) { if (rdev->pm.active_crtcs & (1 << crtc)) { - vbl_status = radeon_get_crtc_scanoutpos(rdev->ddev, crtc, 0, + vbl_status = radeon_get_crtc_scanoutpos(rdev->ddev, + crtc, + USE_REAL_VBLANKSTART, &vpos, &hpos, NULL, NULL, &rdev->mode_info.crtcs[crtc]->base.hwmode); if ((vbl_status & DRM_SCANOUTPOS_VALID) && |