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

Commit 86a1b9d1 authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm: disable encoder rather than dpms off in drm_crtc_prepare_encoders() 



Original behaviour will be preserved for drivers that don't implement
disable() hooks for an encoder.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f5f05c8a

drivers/gpu/drm/drm_crtc_helper.c

+14 −8
Original line number Original line Diff line number Diff line
@@ -201,6 +201,17 @@ bool drm_helper_crtc_in_use(struct drm_crtc *crtc) 
}

}

EXPORT_SYMBOL(drm_helper_crtc_in_use);

EXPORT_SYMBOL(drm_helper_crtc_in_use);





static void

drm_encoder_disable(struct drm_encoder *encoder)

{

	struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;



	if (encoder_funcs->disable)

		(*encoder_funcs->disable)(encoder);

	else

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

}



/**

/**

 * drm_helper_disable_unused_functions - disable unused objects

 * drm_helper_disable_unused_functions - disable unused objects

 * @dev: DRM device

 * @dev: DRM device
@@ -215,7 +226,6 @@ void drm_helper_disable_unused_functions(struct drm_device *dev) 
{

{

	struct drm_encoder *encoder;

	struct drm_encoder *encoder;

	struct drm_connector *connector;

	struct drm_connector *connector;

	struct drm_encoder_helper_funcs *encoder_funcs;

	struct drm_crtc *crtc;

	struct drm_crtc *crtc;





	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
@@ -226,12 +236,8 @@ void drm_helper_disable_unused_functions(struct drm_device *dev) 
	}

	}





	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		encoder_funcs = encoder->helper_private;

		if (!drm_helper_encoder_in_use(encoder)) {

		if (!drm_helper_encoder_in_use(encoder)) {

			if (encoder_funcs->disable)

			drm_encoder_disable(encoder);

				(*encoder_funcs->disable)(encoder);

			else

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

			/* disconnector encoder from any connector */

			/* disconnector encoder from any connector */

			encoder->crtc = NULL;

			encoder->crtc = NULL;

		}

		}
@@ -295,11 +301,11 @@ drm_crtc_prepare_encoders(struct drm_device *dev) 
		encoder_funcs = encoder->helper_private;

		encoder_funcs = encoder->helper_private;

		/* Disable unused encoders */

		/* Disable unused encoders */

		if (encoder->crtc == NULL)

		if (encoder->crtc == NULL)

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

			drm_encoder_disable(encoder);

		/* Disable encoders whose CRTC is about to change */

		/* Disable encoders whose CRTC is about to change */

		if (encoder_funcs->get_crtc &&

		if (encoder_funcs->get_crtc &&

		    encoder->crtc != (*encoder_funcs->get_crtc)(encoder))

		    encoder->crtc != (*encoder_funcs->get_crtc)(encoder))

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

			drm_encoder_disable(encoder);

	}

	}

}

}