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

Commit f76bb39d authored by Steve Cohen's avatar Steve Cohen
Browse files

drm/msm/sde: deprecate the dpms driver callback 



In the 4.14 DRM framework, DPMS is handled by the drm core.  This
change updates the SDE DRM driver ported from 4.9 by deprecating
the DPMS callback which will never get called for atomic DRM drivers.

Change-Id: I6eb9218c9ca8c559e18438f9c10f797c6f60d4b5
Signed-off-by: default avatarSteve Cohen <cohens@codeaurora.org>
parent f8b94fa8

drivers/gpu/drm/msm/sde/sde_connector.c

+0 −35
Original line number Diff line number Diff line
@@ -1185,40 +1185,6 @@ sde_connector_detect(struct drm_connector *connector, bool force) 
	return status;

}



static int sde_connector_dpms(struct drm_connector *connector,

				     int mode)

{

	struct sde_connector *c_conn;



	if (!connector) {

		SDE_ERROR("invalid connector\n");

		return -EINVAL;

	}

	c_conn = to_sde_connector(connector);



	/* validate incoming dpms request */

	switch (mode) {

	case DRM_MODE_DPMS_ON:

	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		SDE_DEBUG("conn %d dpms set to %d\n", connector->base.id, mode);

		break;

	default:

		SDE_ERROR("conn %d dpms set to unrecognized mode %d\n",

				connector->base.id, mode);

		break;

	}



	mutex_lock(&c_conn->lock);

	c_conn->dpms_mode = mode;

	_sde_connector_update_power_locked(c_conn);

	mutex_unlock(&c_conn->lock);



	/* use helper for boilerplate handling */

	return drm_atomic_helper_connector_dpms(connector, mode);

}



int sde_connector_get_dpms(struct drm_connector *connector)

{

	struct sde_connector *c_conn;
@@ -1400,7 +1366,6 @@ static int sde_connector_fill_modes(struct drm_connector *connector, 
}



static const struct drm_connector_funcs sde_connector_ops = {

	.dpms =                   sde_connector_dpms,

	.reset =                  sde_connector_atomic_reset,

	.detect =                 sde_connector_detect,

	.destroy =                sde_connector_destroy,