---

yaml --- r: 163937 b: refs/heads/master c: ff846ab h: refs/heads/master i: 163935: 6a57a17 v: v3
git-mirror · Aug 30, 2009 · a5cbcea · a5cbcea
1 parent 721ec86
commit a5cbcea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f380ef86916904e4b79f7bec599deb51057b2d0c
+refs/heads/master: ff846ab7f76ffecba4f0bef026163d2a2364d7d0
diff --git a/trunk/drivers/gpu/drm/drm_crtc_helper.c b/trunk/drivers/gpu/drm/drm_crtc_helper.c
@@ -823,6 +823,10 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
 		if (new_encoder != connector->encoder) {
 			DRM_DEBUG_KMS("encoder changed, full mode switch\n");
 			mode_changed = true;
+			/* If the encoder is reused for another connector, then
+			 * the appropriate crtc will be set later.
+			 */
+			connector->encoder->crtc = NULL;
 			connector->encoder = new_encoder;
 		}
 	}