Commit 8c5e9bbb authored by Lyude Paul's avatar Lyude Paul
Browse files

drm/amdgpu/dc/mst: Rename dp_mst_stream_allocation(_table) 



Just to make this more clear to outside contributors that these are
DC-specific structs, as this also threw me into a loop a number of times
before I figured out the purpose of this.

Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Cc: Wayne Lin <Wayne.Lin@amd.com>
Cc: Fangzhi Zuo <Jerry.Zuo@amd.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220817193847.557945-2-lyude@redhat.com
parent 0f9fa5f5

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

+4 −5
Original line number Diff line number Diff line
@@ -153,9 +153,8 @@ enum dc_edid_status dm_helpers_parse_edid_caps( 
	return result;

}



static void get_payload_table(

		struct amdgpu_dm_connector *aconnector,

		struct dp_mst_stream_allocation_table *proposed_table)

static void get_payload_table(struct amdgpu_dm_connector *aconnector,

			      struct dc_dp_mst_stream_allocation_table *proposed_table)

{

	int i;

	struct drm_dp_mst_topology_mgr *mst_mgr =
@@ -177,7 +176,7 @@ static void get_payload_table( 
			mst_mgr->payloads[i].payload_state ==

					DP_PAYLOAD_REMOTE) {



			struct dp_mst_stream_allocation *sa =

			struct dc_dp_mst_stream_allocation *sa =

					&proposed_table->stream_allocations[

						proposed_table->stream_count];
@@ -201,7 +200,7 @@ void dm_helpers_dp_update_branch_info( 
bool dm_helpers_dp_mst_write_payload_allocation_table(

		struct dc_context *ctx,

		const struct dc_stream_state *stream,

		struct dp_mst_stream_allocation_table *proposed_table,

		struct dc_dp_mst_stream_allocation_table *proposed_table,

		bool enable)

{

	struct amdgpu_dm_connector *aconnector;

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+5 −5
Original line number Diff line number Diff line
@@ -3516,7 +3516,7 @@ static void update_mst_stream_alloc_table( 
	struct dc_link *link,

	struct stream_encoder *stream_enc,

	struct hpo_dp_stream_encoder *hpo_dp_stream_enc, // TODO: Rename stream_enc to dio_stream_enc?

	const struct dp_mst_stream_allocation_table *proposed_table)

	const struct dc_dp_mst_stream_allocation_table *proposed_table)

{

	struct link_mst_stream_allocation work_table[MAX_CONTROLLER_NUM] = { 0 };

	struct link_mst_stream_allocation *dc_alloc;
@@ -3679,7 +3679,7 @@ enum dc_status dc_link_allocate_mst_payload(struct pipe_ctx *pipe_ctx) 
{

	struct dc_stream_state *stream = pipe_ctx->stream;

	struct dc_link *link = stream->link;

	struct dp_mst_stream_allocation_table proposed_table = {0};

	struct dc_dp_mst_stream_allocation_table proposed_table = {0};

	struct fixed31_32 avg_time_slots_per_mtp;

	struct fixed31_32 pbn;

	struct fixed31_32 pbn_per_slot;
@@ -3784,7 +3784,7 @@ enum dc_status dc_link_reduce_mst_payload(struct pipe_ctx *pipe_ctx, uint32_t bw 
	struct fixed31_32 avg_time_slots_per_mtp;

	struct fixed31_32 pbn;

	struct fixed31_32 pbn_per_slot;

	struct dp_mst_stream_allocation_table proposed_table = {0};

	struct dc_dp_mst_stream_allocation_table proposed_table = {0};

	uint8_t i;

	const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);

	DC_LOGGER_INIT(link->ctx->logger);
@@ -3873,7 +3873,7 @@ enum dc_status dc_link_increase_mst_payload(struct pipe_ctx *pipe_ctx, uint32_t 
	struct fixed31_32 avg_time_slots_per_mtp;

	struct fixed31_32 pbn;

	struct fixed31_32 pbn_per_slot;

	struct dp_mst_stream_allocation_table proposed_table = {0};

	struct dc_dp_mst_stream_allocation_table proposed_table = {0};

	uint8_t i;

	enum act_return_status ret;

	const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
@@ -3957,7 +3957,7 @@ static enum dc_status deallocate_mst_payload(struct pipe_ctx *pipe_ctx) 
{

	struct dc_stream_state *stream = pipe_ctx->stream;

	struct dc_link *link = stream->link;

	struct dp_mst_stream_allocation_table proposed_table = {0};

	struct dc_dp_mst_stream_allocation_table proposed_table = {0};

	struct fixed31_32 avg_time_slots_per_mtp = dc_fixpt_from_int(0);

	int i;

	bool mst_mode = (link->type == dc_connection_mst_branch);

drivers/gpu/drm/amd/display/dc/dm_helpers.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "dc_types.h"

#include "dc.h"



struct dp_mst_stream_allocation_table;

struct dc_dp_mst_stream_allocation_table;

struct aux_payload;

enum aux_return_code_type;
@@ -77,7 +77,7 @@ void dm_helpers_dp_update_branch_info( 
bool dm_helpers_dp_mst_write_payload_allocation_table(

		struct dc_context *ctx,

		const struct dc_stream_state *stream,

		struct dp_mst_stream_allocation_table *proposed_table,

		struct dc_dp_mst_stream_allocation_table *proposed_table,

		bool enable);



/*

drivers/gpu/drm/amd/display/include/link_service_types.h

+8 −3
Original line number Diff line number Diff line
@@ -246,8 +246,13 @@ union dpcd_training_lane_set { 
};





/* AMD's copy of various payload data for MST. We have two copies of the payload table (one in DRM,

 * one in DC) since DRM's MST helpers can't be accessed here. This stream allocation table should

 * _ONLY_ be filled out from DM and then passed to DC, do NOT use these for _any_ kind of atomic

 * state calculations in DM, or you will break something.

 */

/* DP MST stream allocation (payload bandwidth number) */

struct dp_mst_stream_allocation {

struct dc_dp_mst_stream_allocation {

	uint8_t vcp_id;

	/* number of slots required for the DP stream in

	 * transport packet */
@@ -255,11 +260,11 @@ struct dp_mst_stream_allocation { 
};



/* DP MST stream allocation table */

struct dp_mst_stream_allocation_table {

struct dc_dp_mst_stream_allocation_table {

	/* number of DP video streams */

	int stream_count;

	/* array of stream allocations */

	struct dp_mst_stream_allocation stream_allocations[MAX_CONTROLLER_NUM];

	struct dc_dp_mst_stream_allocation stream_allocations[MAX_CONTROLLER_NUM];

};



#endif /*__DAL_LINK_SERVICE_TYPES_H__*/