From f65ba4d57ae03d72b6ae1edf3909636ebc3c369a Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 4 Nov 2011 10:09:40 -0400 Subject: [PATCH] --- yaml --- r: 275287 b: refs/heads/master c: 10b391b946c459a39b631aaf81880f94dcfbff46 h: refs/heads/master i: 275285: 8825aac92d5907bd2def416cce16363bea9a0d8a 275283: 9e774460211d164fee7b8b57a5be40b6da661364 275279: bc51100c6025b85916cce7e04b995893bec4637a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/atombios_crtc.c | 6 ------ trunk/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 6 ------ 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 54e962e6b9c5..8a5532951787 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c3d904b48e44bd9c3121c24efb87c9d39d7736c +refs/heads/master: 10b391b946c459a39b631aaf81880f94dcfbff46 diff --git a/trunk/drivers/gpu/drm/radeon/atombios_crtc.c b/trunk/drivers/gpu/drm/radeon/atombios_crtc.c index 87921c88a95c..87631fede1f8 100644 --- a/trunk/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/trunk/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1522,12 +1522,6 @@ static bool atombios_crtc_mode_fixup(struct drm_crtc *crtc, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { - struct drm_device *dev = crtc->dev; - struct radeon_device *rdev = dev->dev_private; - - /* adjust pm to upcoming mode change */ - radeon_pm_compute_clocks(rdev); - if (!radeon_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode)) return false; return true; diff --git a/trunk/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/trunk/drivers/gpu/drm/radeon/radeon_legacy_crtc.c index 41a5d48e657b..daadf2111040 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_legacy_crtc.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_legacy_crtc.c @@ -991,12 +991,6 @@ static bool radeon_crtc_mode_fixup(struct drm_crtc *crtc, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { - struct drm_device *dev = crtc->dev; - struct radeon_device *rdev = dev->dev_private; - - /* adjust pm to upcoming mode change */ - radeon_pm_compute_clocks(rdev); - if (!radeon_crtc_scaling_mode_fixup(crtc, mode, adjusted_mode)) return false; return true;