diff options
| author | Maarten Maathuis <madman2003@gmail.com> | 2009-08-19 00:56:45 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-08-31 09:09:29 +1000 |
| commit | ff846ab7f76ffecba4f0bef026163d2a2364d7d0 (patch) | |
| tree | 5a38ce7d88bf6996598360cf348489aec8b6a2b4 /drivers | |
| parent | f380ef86916904e4b79f7bec599deb51057b2d0c (diff) | |
drm/crtc_helper: NULL encoder->crtc when switching encoders
- Previously the old encoder would be called during modeset and without a connector bad things happened.
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index a3837b39bb8..205349ea107 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/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; } } |