diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 08:22:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 08:22:50 -0700 |
commit | 0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a (patch) | |
tree | 5e576c9cca633f37790effd1a25ec87f515e39de /drivers/gpu/drm/radeon/radeon_encoders.c | |
parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
parent | 88b045077a1462a47503137fd4ca0c31772819ca (diff) | |
download | kernel_samsung_smdk4412-0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a.zip kernel_samsung_smdk4412-0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a.tar.gz kernel_samsung_smdk4412-0bfb82449c9c98a8cfb1f0f886b5b0c7f7b0ff1a.tar.bz2 |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon: Fix sparc regression in r300_scratch()
drm: make sure vblank interrupts are disabled at DPMS time
drm/radeon/kms/evergreen: No EnableYUV table
drm/radeon: 9800 SE has only one quadpipe
drm/radeon/kms: don't print error for legal crtcs.
drm/radeon/kms/evergreen: fix LUT setup
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_encoders.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 30293be..fed7b80 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -1326,7 +1326,7 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, radeon_encoder->pixel_clock = adjusted_mode->clock; - if (ASIC_IS_AVIVO(rdev)) { + if (ASIC_IS_AVIVO(rdev) && !ASIC_IS_DCE4(rdev)) { if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT)) atombios_yuv_setup(encoder, true); else |