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

Commit 1e56a2be authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: add vcpi parameter for set_stream_info"

parents 975a325a ba415199

drivers/gpu/drm/msm/dp/dp_debug.c

+9 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019, 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
@@ -1951,6 +1951,14 @@ static int dp_debug_init(struct dp_debug *dp_debug) 
		       DEBUG_NAME, rc);

	}



	file = debugfs_create_u32("max_lclk_khz", 0644, dir,

			&debug->parser->max_lclk_khz);

	if (IS_ERR_OR_NULL(file)) {

		rc = PTR_ERR(file);

		pr_err("[%s] debugfs max_lclk_khz failed, rc=%d\n",

		       DEBUG_NAME, rc);

	}



	return 0;



error_remove_dir:

drivers/gpu/drm/msm/dp/dp_display.c

+2 −2
Original line number Diff line number Diff line
@@ -1403,7 +1403,7 @@ static int dp_display_prepare(struct dp_display *dp_display, void *panel) 


static int dp_display_set_stream_info(struct dp_display *dp_display,

			void *panel, u32 strm_id, u32 start_slot,

			u32 num_slots, u32 pbn)

			u32 num_slots, u32 pbn, int vcpi)

{

	int rc = 0;

	struct dp_panel *dp_panel;
@@ -1436,7 +1436,7 @@ static int dp_display_set_stream_info(struct dp_display *dp_display, 
	if (panel) {

		dp_panel = panel;

		dp_panel->set_stream_info(dp_panel, strm_id, start_slot,

				num_slots, pbn);

				num_slots, pbn, vcpi);

	}



	mutex_unlock(&dp->session_lock);

drivers/gpu/drm/msm/dp/dp_display.h

+3 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019, 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
@@ -114,7 +114,8 @@ struct dp_display { 
	int (*get_mst_caps)(struct dp_display *dp_display,

			struct dp_mst_caps *mst_caps);

	int (*set_stream_info)(struct dp_display *dp_display, void *panel,

			u32 strm_id, u32 start_slot, u32 num_slots, u32 pbn);

			u32 strm_id, u32 start_slot, u32 num_slots, u32 pbn,

			int vcpi);

	void (*convert_to_dp_mode)(struct dp_display *dp_display, void *panel,

			const struct drm_display_mode *drm_mode,

			struct dp_display_mode *dp_mode);

drivers/gpu/drm/msm/dp/dp_drm.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019, 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
@@ -123,7 +123,7 @@ static void dp_bridge_pre_enable(struct drm_bridge *drm_bridge) 
	}



	/* for SST force stream id, start slot and total slots to 0 */

	dp->set_stream_info(dp, bridge->dp_panel, 0, 0, 0, 0);

	dp->set_stream_info(dp, bridge->dp_panel, 0, 0, 0, 0, 0);



	rc = dp->enable(dp, bridge->dp_panel);

	if (rc) {

drivers/gpu/drm/msm/dp/dp_mst_drm.c

+4 −2
Original line number Diff line number Diff line
@@ -538,7 +538,8 @@ static void _dp_mst_update_timeslots(struct dp_mst_private *mst, 


		mst->dp_display->set_stream_info(mst->dp_display,

				dp_bridge->dp_panel,

				dp_bridge->id, start_slot, num_slots, pbn);

				dp_bridge->id, start_slot, num_slots, pbn,

				dp_bridge->vcpi);



		pr_info("bridge:%d vcpi:%d start_slot:%d num_slots:%d, pbn:%d\n",

			dp_bridge->id, dp_bridge->vcpi,
@@ -563,7 +564,8 @@ static void _dp_mst_update_single_timeslot(struct dp_mst_private *mst, 


		mst->dp_display->set_stream_info(mst->dp_display,

				mst_bridge->dp_panel,

				mst_bridge->id, start_slot, num_slots, pbn);

				mst_bridge->id, start_slot, num_slots, pbn,

				mst_bridge->vcpi);

	}

}