Commit 48b1f5dd authored Oct 29, 2013 by Ilija Hadzic Committed by Dave Airlie Nov 06, 2013

drm: do not set crtc enabled field twice



There is no need to set crtc->enabled field in
drm_crtc_helper_set_config. This is already done (and
properly restored in case of failure) in
drm_crtc_helper_set_mode that is called by
drm_crtc_helper_set_config. Doing it at only one
place makes restoration in case of failure easier.

Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 7e99acdc

drivers/gpu/drm/drm_crtc_helper.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -795,8 +795,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
		mode_changed = true;

		if (mode_changed) {
		set->crtc->enabled = drm_helper_crtc_in_use(set->crtc);
		if (set->crtc->enabled) {
		if (drm_helper_crtc_in_use(set->crtc)) {
		DRM_DEBUG_KMS("attempting to set mode from"
		" userspace\n");
		drm_mode_debug_printmodeline(set->mode);