Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Daniel Vetter and committed by
Dave Airlie
177cf92d 41ccec35

+2 -1
+2 -1
drivers/gpu/drm/drm_crtc_helper.c
··· 695 695 if (new_encoder == NULL) 696 696 /* don't break so fail path works correct */ 697 697 fail = 1; 698 - break; 699 698 700 699 if (connector->dpms != DRM_MODE_DPMS_ON) { 701 700 DRM_DEBUG_KMS("connector dpms not on, full mode switch\n"); 702 701 mode_changed = true; 703 702 } 703 + 704 + break; 704 705 } 705 706 } 706 707