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

Commit 2db0fb95 authored by Steve Cohen's avatar Steve Cohen
Browse files

drm/msm/sde: use internal set property for custom property reset 



DRM framework no longer exports it's set property functions for planes
and connectors to sub-drivers.  For custom properties these calls would
normally come back to the SDE layer anyway, so just call the SDE
functions directly.  DRM set property helper functions and legacy
(non-atomic) set property functions have also been deprecated or are
no longer called on atomic sub-drivers so these have been removed
from SDE as well.

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

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

+2 −16
Original line number Diff line number Diff line
@@ -1046,19 +1046,6 @@ static int sde_connector_atomic_set_property(struct drm_connector *connector, 
	return rc;

}



static int sde_connector_set_property(struct drm_connector *connector,

		struct drm_property *property,

		uint64_t val)

{

	if (!connector) {

		SDE_ERROR("invalid connector\n");

		return -EINVAL;

	}



	return sde_connector_atomic_set_property(connector,

			connector->state, property, val);

}



static int sde_connector_atomic_get_property(struct drm_connector *connector,

		const struct drm_connector_state *state,

		struct drm_property *property,
@@ -1233,7 +1220,7 @@ int sde_connector_set_property_for_commit(struct drm_connector *connector, 
		return -EINVAL;

	}



	return drm_atomic_connector_set_property(

	return sde_connector_atomic_set_property(

			connector, state, property, value);

}
@@ -1276,7 +1263,7 @@ int sde_connector_helper_reset_custom_properties( 
		SDE_DEBUG_CONN(c_conn, "set prop %s idx %d from %llu to %llu\n",

				drm_prop->name, prop_idx, val, def);



		ret = drm_atomic_connector_set_property(connector,

		ret = sde_connector_atomic_set_property(connector,

				connector_state, drm_prop, def);

		if (ret) {

			SDE_ERROR_CONN(c_conn,
@@ -1374,7 +1361,6 @@ static const struct drm_connector_funcs sde_connector_ops = { 
	.atomic_destroy_state =   sde_connector_atomic_destroy_state,

	.atomic_set_property =    sde_connector_atomic_set_property,

	.atomic_get_property =    sde_connector_atomic_get_property,

	.set_property =           sde_connector_set_property,

	.late_register =          sde_connector_late_register,

	.early_unregister =       sde_connector_early_unregister,

};

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

+51 −65
Original line number Diff line number Diff line
@@ -4733,56 +4733,7 @@ void sde_crtc_cancel_pending_flip(struct drm_crtc *crtc, struct drm_file *file) 
	_sde_crtc_complete_flip(crtc, file);

}



int sde_crtc_helper_reset_custom_properties(struct drm_crtc *crtc,

		struct drm_crtc_state *crtc_state)

{

	struct sde_crtc *sde_crtc;

	struct sde_crtc_state *cstate;

	struct drm_property *drm_prop;

	enum msm_mdp_crtc_property prop_idx;



	if (!crtc || !crtc_state) {

		SDE_ERROR("invalid params\n");

		return -EINVAL;

	}



	sde_crtc = to_sde_crtc(crtc);

	cstate = to_sde_crtc_state(crtc_state);



	for (prop_idx = 0; prop_idx < CRTC_PROP_COUNT; prop_idx++) {

		uint64_t val = cstate->property_values[prop_idx].value;

		uint64_t def;

		int ret;



		drm_prop = msm_property_index_to_drm_property(

				&sde_crtc->property_info, prop_idx);

		if (!drm_prop) {

			/* not all props will be installed, based on caps */

			SDE_DEBUG("%s: invalid property index %d\n",

					sde_crtc->name, prop_idx);

			continue;

		}



		def = msm_property_get_default(&sde_crtc->property_info,

				prop_idx);

		if (val == def)

			continue;



		SDE_DEBUG("%s: set prop %s idx %d from %llu to %llu\n",

				sde_crtc->name, drm_prop->name, prop_idx, val,

				def);



		ret = drm_atomic_crtc_set_property(crtc, crtc_state, drm_prop,

				def);

		if (ret) {

			SDE_ERROR("%s: set property failed, idx %d ret %d\n",

					sde_crtc->name, prop_idx, ret);

			continue;

		}

	}



	return 0;

}



/**

 * sde_crtc_install_properties - install all drm properties for crtc
@@ -5142,21 +5093,6 @@ static int sde_crtc_atomic_set_property(struct drm_crtc *crtc, 
	return ret;

}



/**

 * sde_crtc_set_property - set a crtc drm property

 * @crtc: Pointer to drm crtc structure

 * @property: Pointer to targeted drm property

 * @val: Updated property value

 * @Returns: Zero on success

 */

static int sde_crtc_set_property(struct drm_crtc *crtc,

		struct drm_property *property, uint64_t val)

{

	SDE_DEBUG("\n");



	return sde_crtc_atomic_set_property(crtc, crtc->state, property, val);

}



/**

 * sde_crtc_atomic_get_property - retrieve a crtc drm property

 * @crtc: Pointer to drm crtc structure
@@ -5198,6 +5134,57 @@ static int sde_crtc_atomic_get_property(struct drm_crtc *crtc, 
	return ret;

}



int sde_crtc_helper_reset_custom_properties(struct drm_crtc *crtc,

		struct drm_crtc_state *crtc_state)

{

	struct sde_crtc *sde_crtc;

	struct sde_crtc_state *cstate;

	struct drm_property *drm_prop;

	enum msm_mdp_crtc_property prop_idx;



	if (!crtc || !crtc_state) {

		SDE_ERROR("invalid params\n");

		return -EINVAL;

	}



	sde_crtc = to_sde_crtc(crtc);

	cstate = to_sde_crtc_state(crtc_state);



	for (prop_idx = 0; prop_idx < CRTC_PROP_COUNT; prop_idx++) {

		uint64_t val = cstate->property_values[prop_idx].value;

		uint64_t def;

		int ret;



		drm_prop = msm_property_index_to_drm_property(

				&sde_crtc->property_info, prop_idx);

		if (!drm_prop) {

			/* not all props will be installed, based on caps */

			SDE_DEBUG("%s: invalid property index %d\n",

					sde_crtc->name, prop_idx);

			continue;

		}



		def = msm_property_get_default(&sde_crtc->property_info,

				prop_idx);

		if (val == def)

			continue;



		SDE_DEBUG("%s: set prop %s idx %d from %llu to %llu\n",

				sde_crtc->name, drm_prop->name, prop_idx, val,

				def);



		ret = sde_crtc_atomic_set_property(crtc, crtc_state, drm_prop,

				def);

		if (ret) {

			SDE_ERROR("%s: set property failed, idx %d ret %d\n",

					sde_crtc->name, prop_idx, ret);

			continue;

		}

	}



	return 0;

}



#ifdef CONFIG_DEBUG_FS

static int _sde_debugfs_status_show(struct seq_file *s, void *data)

{
@@ -5579,7 +5566,6 @@ static const struct drm_crtc_funcs sde_crtc_funcs = { 
	.set_config = drm_atomic_helper_set_config,

	.destroy = sde_crtc_destroy,

	.page_flip = drm_atomic_helper_page_flip,

	.set_property = sde_crtc_set_property,

	.atomic_set_property = sde_crtc_atomic_set_property,

	.atomic_get_property = sde_crtc_atomic_get_property,

	.reset = sde_crtc_reset,

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

+58 −54
Original line number Diff line number Diff line
@@ -3949,56 +3949,6 @@ void sde_plane_restore(struct drm_plane *plane) 
	sde_plane_atomic_update(plane, plane->state);

}



int sde_plane_helper_reset_custom_properties(struct drm_plane *plane,

		struct drm_plane_state *plane_state)

{

	struct sde_plane *psde;

	struct sde_plane_state *pstate;

	struct drm_property *drm_prop;

	enum msm_mdp_plane_property prop_idx;



	if (!plane || !plane_state) {

		SDE_ERROR("invalid params\n");

		return -EINVAL;

	}



	psde = to_sde_plane(plane);

	pstate = to_sde_plane_state(plane_state);



	for (prop_idx = 0; prop_idx < PLANE_PROP_COUNT; prop_idx++) {

		uint64_t val = pstate->property_values[prop_idx].value;

		uint64_t def;

		int ret;



		drm_prop = msm_property_index_to_drm_property(

				&psde->property_info, prop_idx);

		if (!drm_prop) {

			/* not all props will be installed, based on caps */

			SDE_DEBUG_PLANE(psde, "invalid property index %d\n",

					prop_idx);

			continue;

		}



		def = msm_property_get_default(&psde->property_info, prop_idx);

		if (val == def)

			continue;



		SDE_DEBUG_PLANE(psde, "set prop %s idx %d from %llu to %llu\n",

				drm_prop->name, prop_idx, val, def);



		ret = drm_atomic_plane_set_property(plane, plane_state,

				drm_prop, def);

		if (ret) {

			SDE_ERROR_PLANE(psde,

					"set property failed, idx %d ret %d\n",

					prop_idx, ret);

			continue;

		}

	}



	return 0;

}



/* helper to install properties which are common to planes and crtcs */

static void _sde_plane_install_properties(struct drm_plane *plane,

	struct sde_mdss_cfg *catalog, u32 master_plane_id)
@@ -4490,6 +4440,56 @@ static int sde_plane_atomic_get_property(struct drm_plane *plane, 
	return ret;

}



int sde_plane_helper_reset_custom_properties(struct drm_plane *plane,

		struct drm_plane_state *plane_state)

{

	struct sde_plane *psde;

	struct sde_plane_state *pstate;

	struct drm_property *drm_prop;

	enum msm_mdp_plane_property prop_idx;



	if (!plane || !plane_state) {

		SDE_ERROR("invalid params\n");

		return -EINVAL;

	}



	psde = to_sde_plane(plane);

	pstate = to_sde_plane_state(plane_state);



	for (prop_idx = 0; prop_idx < PLANE_PROP_COUNT; prop_idx++) {

		uint64_t val = pstate->property_values[prop_idx].value;

		uint64_t def;

		int ret;



		drm_prop = msm_property_index_to_drm_property(

				&psde->property_info, prop_idx);

		if (!drm_prop) {

			/* not all props will be installed, based on caps */

			SDE_DEBUG_PLANE(psde, "invalid property index %d\n",

					prop_idx);

			continue;

		}



		def = msm_property_get_default(&psde->property_info, prop_idx);

		if (val == def)

			continue;



		SDE_DEBUG_PLANE(psde, "set prop %s idx %d from %llu to %llu\n",

				drm_prop->name, prop_idx, val, def);



		ret = sde_plane_atomic_set_property(plane, plane_state,

				drm_prop, def);

		if (ret) {

			SDE_ERROR_PLANE(psde,

					"set property failed, idx %d ret %d\n",

					prop_idx, ret);

			continue;

		}

	}



	return 0;

}



static void sde_plane_destroy(struct drm_plane *plane)

{

	struct sde_plane *psde = plane ? to_sde_plane(plane) : NULL;
@@ -4554,6 +4554,7 @@ sde_plane_duplicate_state(struct drm_plane *plane) 
	struct sde_plane *psde;

	struct sde_plane_state *pstate;

	struct sde_plane_state *old_state;

	struct drm_property *drm_prop;

	uint64_t input_fence_default;



	if (!plane) {
@@ -4582,9 +4583,13 @@ sde_plane_duplicate_state(struct drm_plane *plane) 
	pstate->input_fence = 0;

	input_fence_default = msm_property_get_default(

			&psde->property_info, PLANE_PROP_INPUT_FENCE);

	msm_property_set_property(&psde->property_info,

			&pstate->property_state,

			PLANE_PROP_INPUT_FENCE, input_fence_default);

	drm_prop = msm_property_index_to_drm_property(

				&psde->property_info, PLANE_PROP_INPUT_FENCE);

	if (msm_property_atomic_set(&psde->property_info,

				&pstate->property_state, drm_prop,

				input_fence_default))

		SDE_DEBUG_PLANE(psde,

				"error clearing duplicated input fence\n");



	pstate->dirty = 0x0;

	pstate->pending = false;
@@ -4870,7 +4875,6 @@ static const struct drm_plane_funcs sde_plane_funcs = { 
		.update_plane = drm_atomic_helper_update_plane,

		.disable_plane = drm_atomic_helper_disable_plane,

		.destroy = sde_plane_destroy,

		.set_property = drm_atomic_helper_plane_set_property,

		.atomic_set_property = sde_plane_atomic_set_property,

		.atomic_get_property = sde_plane_atomic_get_property,

		.reset = sde_plane_reset,