diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-01 22:14:59 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-04-02 10:31:04 +1000 |
| commit | 177cf92de4aa97ec1435987e91696ed8b5023130 (patch) | |
| tree | 3274ac64eb6418a988be204ec615c96604d3563e /drivers/gpu/drm/drm_crtc_helper.c | |
| parent | 41ccec352f3c823931a7d9d2a9c7880c14d7415a (diff) | |
| download | op-kernel-dev-177cf92de4aa97ec1435987e91696ed8b5023130.zip op-kernel-dev-177cf92de4aa97ec1435987e91696ed8b5023130.tar.gz | |
drm/crtc-helpers: fix dpms on logic
This was introduced in
commit 25f397a429dfa43f22c278d0119a60a343aa568f
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: Dan 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: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_crtc_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index c0f2d62..8108db9 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -695,12 +695,13 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) if (new_encoder == NULL) /* don't break so fail path works correct */ fail = 1; - break; if (connector->dpms != DRM_MODE_DPMS_ON) { DRM_DEBUG_KMS("connector dpms not on, full mode switch\n"); mode_changed = true; } + + break; } } |
