stable - drm/radeon/kms: fix crtc vblank update for r600
Subsystems (2)
Dave Airlie
maintainerPATCH 1/1 stable - drm/radeon/kms: fix crtc vblank update for r600
From: Dave Airlie <[email protected]>
In 2.6.32.2 r600 had no IRQ support, however the patch in 500b758725314ab1b5316eb0caa5b0fa26740e6b to fix vblanks on avivo cards, needs irqs.
So check for an R600 card and avoid this path if so.
This is a stable only patch for 2.6.32.2 as 2.6.33 has IRQs for r600.
Signed-off-by Dave Airlie <[email protected]>
--- drivers/gpu/drm/radeon/atombios_crtc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/atombios_crtc.c +4 -2
@@ -249,13 +249,15 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)if (ASIC_IS_DCE3 (rdev))atombios_enable_crtc_memreq (crtc,1 );atombios_blank_crtc (crtc,0 ); -drm_vblank_post_modeset (dev, radeon_crtc->crtc_id); +if (rdev->family <CHIP_R600 ) +drm_vblank_post_modeset (dev, radeon_crtc->crtc_id);radeon_crtc_load_lut (crtc);break ;case DRM_MODE_DPMS_STANDBY :case DRM_MODE_DPMS_SUSPEND :case DRM_MODE_DPMS_OFF : -drm_vblank_pre_modeset (dev, radeon_crtc->crtc_id); +if (rdev->family <CHIP_R600 ) +drm_vblank_pre_modeset (dev, radeon_crtc->crtc_id);atombios_blank_crtc (crtc,1 );if (ASIC_IS_DCE3 (rdev))atombios_enable_crtc_memreq (crtc,0 );
Signature · 1 line
1.6.5.2