diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:22:08 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-30 11:22:08 +0800 |
| commit | 877c2196bf43e410b8b1a66c7bbf7d5cb98a9f41 (patch) | |
| tree | f74b6a59cd223c470830b3e4f3e1b6a4270abc1a /drivers/gpu/drm/radeon/atombios_crtc.c | |
| parent | b95b6a6ddfae1513893676e444f585a106513688 (diff) | |
| parent | 2dad587ec1dddf02a00d3b54156337a6dc79a752 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlinux-linaro-lsk-v3.14-android
Conflicts:
net/netfilter/xt_socket.c
Diffstat (limited to 'drivers/gpu/drm/radeon/atombios_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atombios_crtc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 0cca5f24196a..663394f0c166 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1306,6 +1306,9 @@ static int dce4_crtc_do_set_base(struct drm_crtc *crtc, (x << 16) | y); viewport_w = crtc->mode.hdisplay; viewport_h = (crtc->mode.vdisplay + 1) & ~1; + if ((rdev->family >= CHIP_BONAIRE) && + (crtc->mode.flags & DRM_MODE_FLAG_INTERLACE)) + viewport_h *= 2; WREG32(EVERGREEN_VIEWPORT_SIZE + radeon_crtc->crtc_offset, (viewport_w << 16) | viewport_h); |