From a5cbcead3018300c85a2c6392145dc48738d8ecd Mon Sep 17 00:00:00 2001 From: Maarten Maathuis Date: Wed, 19 Aug 2009 00:56:45 +0200 Subject: [PATCH] --- yaml --- r: 163937 b: refs/heads/master c: ff846ab7f76ffecba4f0bef026163d2a2364d7d0 h: refs/heads/master i: 163935: 6a57a175b79903defa2fc058e0e67b59b0024302 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_crtc_helper.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fab3c09862ce..9669f299596c 100644 --- 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 index a3837b39bb8f..205349ea1075 100644 --- 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; } }