Merge "Revert "drm: call clear_payload_id_table when mst mode is enabled"" (d976e318) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/drm/drm_dp_mst_topology.c

+0 −41

Original line number	Diff line number	Diff line
		@@ -56,8 +56,6 @@ static void drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,
		static int drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr,
		struct drm_dp_mst_branch *mstb,
		struct drm_dp_mst_port *port);
		static int drm_dp_send_clear_payload_table(struct drm_dp_mst_topology_mgr *mgr,
		struct drm_dp_mst_branch *mstb);
		static bool drm_dp_validate_guid(struct drm_dp_mst_topology_mgr *mgr,
		u8 *guid);

		@@ -591,8 +589,6 @@ static bool drm_dp_sideband_parse_reply(struct drm_dp_sideband_msg_rx *raw,
		case DP_POWER_DOWN_PHY:
		case DP_POWER_UP_PHY:
		return drm_dp_sideband_parse_power_updown_phy_ack(raw, msg);
		case DP_CLEAR_PAYLOAD_ID_TABLE:
		return true;
		default:
		DRM_ERROR("Got unknown reply 0x%02x\n", msg->req_type);
		return false;
		@@ -735,15 +731,6 @@ static int build_power_updown_phy(struct drm_dp_sideband_msg_tx *msg,
		return 0;
		}

		static int build_clear_payload_id_table(struct drm_dp_sideband_msg_tx *msg)
		{
		struct drm_dp_sideband_msg_req_body req;

		req.req_type = DP_CLEAR_PAYLOAD_ID_TABLE;
		drm_dp_encode_sideband_req(&req, msg);
		return 0;
		}

		static int drm_dp_mst_assign_payload_id(struct drm_dp_mst_topology_mgr *mgr,
		struct drm_dp_vcpi *vcpi)
		{
		@@ -1877,32 +1864,6 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr,
		}
		EXPORT_SYMBOL(drm_dp_send_power_updown_phy);

		static int drm_dp_send_clear_payload_table(struct drm_dp_mst_topology_mgr *mgr,
		struct drm_dp_mst_branch *mstb)
		{
		struct drm_dp_sideband_msg_tx *txmsg;
		int len, ret;

		txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
		if (!txmsg)
		return -ENOMEM;

		txmsg->dst = mstb;
		len = build_clear_payload_id_table(txmsg);
		drm_dp_queue_down_tx(mgr, txmsg);

		ret = drm_dp_mst_wait_tx_reply(mstb, txmsg);
		if (ret > 0) {
		if (txmsg->reply.reply_type == 1)
		ret = -EINVAL;
		else
		ret = 0;
		}
		kfree(txmsg);

		return ret;
		}

		int drm_dp_mst_get_dsc_info(struct drm_dp_mst_topology_mgr *mgr,
		struct drm_dp_mst_port *port,
		struct drm_dp_mst_dsc_info *dsc_info)
		@@ -2362,8 +2323,6 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
		drm_dp_dpcd_write_payload(mgr, 0, &reset_pay);
		}

		drm_dp_send_clear_payload_table(mgr, mstb);

		queue_work(system_long_wq, &mgr->work);

		ret = 0;