diff options
| author | Liu Ying <gnuiyl@gmail.com> | 2016-05-27 17:35:54 +0800 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-05-30 10:44:15 +0200 |
| commit | f55f1701168de914f3d872398d649d330c348f27 (patch) | |
| tree | 397ad35cef0a572edac4a54b15ad4a5106bde283 | |
| parent | c67f69576bba438e69f3d0657e08bdecb4cc2097 (diff) | |
| download | op-kernel-dev-f55f1701168de914f3d872398d649d330c348f27.zip op-kernel-dev-f55f1701168de914f3d872398d649d330c348f27.tar.gz | |
drm/atomic-helper: Do not call ->mode_fixup for CRTC which will be disabled
When a CRTC is going to be disabled, it's state may contain a display mode
with zeroed content. This could be reproduced by HDMI cable hotplug out
operation with legacy fbdev support in dual display cases. It would confuse
driver's CRTC callback ->mode_fixup and make the total state be rejected.
So, let's don't call the callback for the CRTC.
Signed-off-by: Liu Ying <gnuiyl@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1464341754-7087-1-git-send-email-gnuiyl@gmail.com
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index ddfa0d1..939df90 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -414,6 +414,9 @@ mode_fixup(struct drm_atomic_state *state) for_each_crtc_in_state(state, crtc, crtc_state, i) { const struct drm_crtc_helper_funcs *funcs; + if (!crtc_state->enable) + continue; + if (!crtc_state->mode_changed && !crtc_state->connectors_changed) continue; |
