---

yaml --- r: 189339 b: refs/heads/master c: 57f50d7 h: refs/heads/master i: 189337: 01c70df 189335: 9e7ab01 v: v3
git-mirror · Mar 30, 2010 · 181ac40 · 181ac40
1 parent 34049f4
commit 181ac40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29fb52ca78b4e265ec6c626b0c7b2927953949cf
+refs/heads/master: 57f50d70e27f99a9a785c760b2123cdf6a68e2de
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_pm.c b/trunk/drivers/gpu/drm/radeon/radeon_pm.c
@@ -279,7 +279,8 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev)
 	list_for_each_entry(connector,
 		&ddev->mode_config.connector_list, head) {
 		if (connector->encoder &&
-			connector->dpms != DRM_MODE_DPMS_OFF) {
+		    connector->encoder->crtc &&
+		    connector->dpms != DRM_MODE_DPMS_OFF) {
 			radeon_crtc = to_radeon_crtc(connector->encoder->crtc);
 			rdev->pm.active_crtcs |= (1 << radeon_crtc->crtc_id);
 			++count;