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

Commit 4e7334e5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: remove fence support through get_property"

parents ddd9d5bb 1f5a5a2c

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

+5 −3
Original line number Diff line number Diff line
@@ -1086,12 +1086,14 @@ static int sde_connector_atomic_get_property(struct drm_connector *connector, 
	c_state = to_sde_connector_state(state);



	idx = msm_property_index(&c_conn->property_info, property);

	if (idx == CONNECTOR_PROP_RETIRE_FENCE)

		rc = sde_fence_create(&c_conn->retire_fence, val, 0);

	else

	if (idx == CONNECTOR_PROP_RETIRE_FENCE) {

		*val = ~0;

		rc = 0;

	} else {

		/* get cached property value */

		rc = msm_property_atomic_get(&c_conn->property_info,

				&c_state->property_state, property, val);

	}



	/* allow for custom override */

	if (c_conn->ops.get_property)

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

+2 −1
Original line number Diff line number Diff line
@@ -5214,7 +5214,8 @@ static int sde_crtc_atomic_get_property(struct drm_crtc *crtc, 


	i = msm_property_index(&sde_crtc->property_info, property);

	if (i == CRTC_PROP_OUTPUT_FENCE) {

		ret = _sde_crtc_get_output_fence(crtc, state, val);

		*val = ~0;

		ret = 0;

	} else {

		ret = msm_property_atomic_get(&sde_crtc->property_info,

			&cstate->property_state, property, val);