Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c552dd7 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/crtc: fix mismerge of last patch. 



We only want to NULL encoder->crtc when it is off.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a3a0544b

drivers/gpu/drm/drm_crtc_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -278,10 +278,10 @@ void drm_helper_disable_unused_functions(struct drm_device *dev) 
				(*encoder_funcs->disable)(encoder);

			else

				(*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);

		}

			/* disconnector encoder from any connector */

			encoder->crtc = NULL;

		}

	}



	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;