Merge "drm/msm/sde: move topology name reset to release resources" into msm-4.9 (daf726b5) · Commits · e / devices / android_kernel_fairphone_FP3

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

+17 −9

Original line number	Diff line number	Diff line
		@@ -1130,14 +1130,6 @@ void _sde_rm_release_rsvp(
		}

		kfree(rsvp);

		/* if no remaining reservation, then clear the topology name */
		if (!_sde_rm_get_rsvp(rm, conn->encoder))
		(void) msm_property_set_property(
		sde_connector_get_propinfo(conn),
		sde_connector_get_property_values(conn->state),
		CONNECTOR_PROP_TOPOLOGY_NAME,
		SDE_RM_TOPOLOGY_UNKNOWN);
		}

		void sde_rm_release(struct sde_rm rm, struct drm_encoder enc)
		@@ -1173,6 +1165,12 @@ void sde_rm_release(struct sde_rm rm, struct drm_encoder enc)
		SDE_DEBUG("release rsvp[s%de%d]\n", rsvp->seq,
		rsvp->enc_id);
		_sde_rm_release_rsvp(rm, rsvp, conn);

		(void) msm_property_set_property(
		sde_connector_get_propinfo(conn),
		sde_connector_get_property_values(conn->state),
		CONNECTOR_PROP_TOPOLOGY_NAME,
		SDE_RM_TOPOLOGY_UNKNOWN);
		}
		}

		@@ -1190,8 +1188,12 @@ static int _sde_rm_commit_rsvp(
		sde_connector_get_property_values(conn_state),
		CONNECTOR_PROP_TOPOLOGY_NAME,
		rsvp->topology);
		if (ret)
		if (ret) {
		SDE_ERROR("failed to set topology name property, ret %d\n",
		ret);
		_sde_rm_release_rsvp(rm, rsvp, conn_state->connector);
		return ret;
		}

		/* Swap next rsvp to be the active */
		for (type = 0; type < SDE_HW_BLK_MAX; type++) {
		@@ -1284,6 +1286,12 @@ int sde_rm_reserve(
		_sde_rm_release_rsvp(rm, rsvp_cur, conn_state->connector);
		rsvp_cur = NULL;
		_sde_rm_print_rsvps(rm, SDE_RM_STAGE_AFTER_CLEAR);
		(void) msm_property_set_property(
		sde_connector_get_propinfo(
		conn_state->connector),
		sde_connector_get_property_values(conn_state),
		CONNECTOR_PROP_TOPOLOGY_NAME,
		SDE_RM_TOPOLOGY_UNKNOWN);
		}

		/* Check the proposed reservation, store it in hw's "next" field */