Merge "drm/msm/sde: move topology name reset to release resources" (05eae98b) · Commits · e / devices / android_kernel_sony_msm8998

drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1428,8 +1428,8 @@ int sde_hdmi_get_info(struct msm_display_info *info,
		MSM_DISPLAY_CAP_EDID \| MSM_DISPLAY_CAP_VID_MODE;
		}
		info->is_connected = hdmi_display->connected;
		info->max_width = 1920;
		info->max_height = 1080;
		info->max_width = 4096;
		info->max_height = 2160;
		info->compression = MSM_DISPLAY_COMPRESS_NONE;

		mutex_unlock(&hdmi_display->display_lock);

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

+18 −8

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1074,12 +1074,6 @@ void _sde_rm_release_rsvp(
		}

		kfree(rsvp);

		(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)
		@@ -1115,6 +1109,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);
		}
		}

		@@ -1132,8 +1132,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++) {
		@@ -1226,6 +1230,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 */