提交 177cf92d 编写于 作者: D Daniel Vetter 提交者: Dave Airlie

drm/crtc-helpers: fix dpms on logic

This was introduced in

commit 25f397a4
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Fri Jul 19 18:57:11 2013 +0200

    drm/crtc-helper: explicit DPMS on after modeset

but due to a bit of rebase fail on my side the patch actually merged
put one hunk on the wrong side of a break statement. Fix this up.
Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: NDave Airlie <airlied@redhat.com>
上级 41ccec35
...@@ -695,12 +695,13 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) ...@@ -695,12 +695,13 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
if (new_encoder == NULL) if (new_encoder == NULL)
/* don't break so fail path works correct */ /* don't break so fail path works correct */
fail = 1; fail = 1;
break;
if (connector->dpms != DRM_MODE_DPMS_ON) { if (connector->dpms != DRM_MODE_DPMS_ON) {
DRM_DEBUG_KMS("connector dpms not on, full mode switch\n"); DRM_DEBUG_KMS("connector dpms not on, full mode switch\n");
mode_changed = true; mode_changed = true;
} }
break;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册