Commit 0971c40e authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Rename dc_stream to dc_stream_state 



find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \
-o -name "*.cpp" -o -name "*.hpp" | \
xargs sed -i 's/struct dc_stream/struct dc_stream_state/g'

find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \
-o -name "*.cpp" -o -name "*.hpp" | \
xargs sed -i 's/struct dc_stream_state_update/struct dc_stream_update/g'

find -name Makefile -o -name Kconfig -o -name "*.c" -o -name "*.h" \
-o -name "*.cpp" -o -name "*.hpp" | \
xargs sed -i 's/struct dc_stream_state_status/struct dc_stream_status/g'

Plus some manual changes

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c9614aeb

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

+22 −20
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ static u32 dm_vblank_get_counter(struct amdgpu_device *adev, int crtc) 




		if (acrtc_state->stream == NULL) {

			DRM_ERROR("dc_stream is NULL for crtc '%d'!\n", crtc);

			DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",

				  crtc);

			return 0;

		}
@@ -137,7 +138,8 @@ static int dm_crtc_get_scanoutpos(struct amdgpu_device *adev, int crtc, 
						acrtc->base.state);



		if (acrtc_state->stream ==  NULL) {

			DRM_ERROR("dc_stream is NULL for crtc '%d'!\n", crtc);

			DRM_ERROR("dc_stream_state is NULL for crtc '%d'!\n",

				  crtc);

			return 0;

		}
@@ -1441,7 +1443,7 @@ static int amdgpu_notify_freesync(struct drm_device *dev, void *data, 
	num_streams = dc_get_current_stream_count(adev->dm.dc);



	for (i = 0; i < num_streams; i++) {

		struct dc_stream *stream;

		struct dc_stream_state *stream;

		stream = dc_get_stream_at_index(adev->dm.dc, i);



		mod_freesync_update_state(adev->dm.freesync_module,
@@ -1609,8 +1611,8 @@ struct dm_connector_state { 
	container_of((x), struct dm_connector_state, base)



static bool modeset_required(struct drm_crtc_state *crtc_state,

			     struct dc_stream *new_stream,

			     struct dc_stream *old_stream)

			     struct dc_stream_state *new_stream,

			     struct dc_stream_state *old_stream)

{

	if (dc_is_stream_unchanged(new_stream, old_stream)) {

		crtc_state->mode_changed = false;
@@ -2141,7 +2143,7 @@ struct amdgpu_connector *aconnector_from_drm_crtc_id( 
static void update_stream_scaling_settings(

		const struct drm_display_mode *mode,

		const struct dm_connector_state *dm_state,

		struct dc_stream *stream)

		struct dc_stream_state *stream)

{

	enum amdgpu_rmx_type rmx_type;
@@ -2285,7 +2287,7 @@ static enum dc_color_space get_output_color_space( 
/*****************************************************************************/



static void fill_stream_properties_from_drm_display_mode(

	struct dc_stream *stream,

	struct dc_stream_state *stream,

	const struct drm_display_mode *mode_in,

	const struct drm_connector *connector)

{
@@ -2426,14 +2428,14 @@ static void decide_crtc_timing_for_drm_display_mode( 
	}

}



static struct dc_stream *create_stream_for_sink(

static struct dc_stream_state *create_stream_for_sink(

		struct amdgpu_connector *aconnector,

		const struct drm_display_mode *drm_mode,

		const struct dm_connector_state *dm_state)

{

	struct drm_display_mode *preferred_mode = NULL;

	const struct drm_connector *drm_connector;

	struct dc_stream *stream = NULL;

	struct dc_stream_state *stream = NULL;

	struct drm_display_mode mode = *drm_mode;

	bool native_mode_found = false;
@@ -2842,7 +2844,7 @@ int amdgpu_dm_connector_mode_valid( 
	struct dc_sink *dc_sink;

	struct amdgpu_device *adev = connector->dev->dev_private;

	/* TODO: Unhardcode stream count */

	struct dc_stream *stream;

	struct dc_stream_state *stream;

	struct amdgpu_connector *aconnector = to_amdgpu_connector(connector);



	if ((mode->flags & DRM_MODE_FLAG_INTERLACE) ||
@@ -3119,7 +3121,7 @@ int dm_create_validation_set_for_connector(struct drm_connector *connector, 
	struct dc_sink *dc_sink =

			to_amdgpu_connector(connector)->dc_sink;

	/* TODO: Unhardcode stream count */

	struct dc_stream *stream;

	struct dc_stream_state *stream;



	if ((mode->flags & DRM_MODE_FLAG_INTERLACE) ||

			(mode->flags & DRM_MODE_FLAG_DBLSCAN))
@@ -3770,7 +3772,7 @@ static bool is_scaling_state_different( 
static void remove_stream(

		struct amdgpu_device *adev,

		struct amdgpu_crtc *acrtc,

		struct dc_stream *stream)

		struct dc_stream_state *stream)

{

	/* this is the update mode case */

	if (adev->dm.freesync_module)
@@ -3925,7 +3927,7 @@ static void amdgpu_dm_commit_surfaces(struct drm_atomic_state *state, 
	uint32_t i;

	struct drm_plane *plane;

	struct drm_plane_state *old_plane_state;

	struct dc_stream *dc_stream_attach;

	struct dc_stream_state *dc_stream_attach;

	struct dc_plane_state *dc_surfaces_constructed[MAX_SURFACES];

	struct amdgpu_crtc *acrtc_attach = to_amdgpu_crtc(pcrtc);

	struct dm_crtc_state *acrtc_state = to_dm_crtc_state(pcrtc->state);
@@ -4061,7 +4063,7 @@ void amdgpu_dm_atomic_commit_tail( 
	struct drm_crtc *crtc, *pcrtc;

	struct drm_crtc_state *old_crtc_state;

	struct amdgpu_crtc *new_crtcs[MAX_STREAMS];

	struct dc_stream *new_stream = NULL;

	struct dc_stream_state *new_stream = NULL;

	unsigned long flags;

	bool wait_for_vblank = true;

	struct drm_connector *connector;
@@ -4220,7 +4222,7 @@ void amdgpu_dm_atomic_commit_tail( 
		new_acrtc_state = to_dm_crtc_state(acrtc->base.state);



		update_stream_scaling_settings(&con_new_state->base.crtc->mode,

				con_new_state, (struct dc_stream *)new_acrtc_state->stream);

				con_new_state, (struct dc_stream_state *)new_acrtc_state->stream);



		status = dc_stream_get_status(new_acrtc_state->stream);

		WARN_ON(!status);
@@ -4376,7 +4378,7 @@ void dm_restore_drm_connector_state(struct drm_device *dev, struct drm_connector 
static uint32_t add_val_sets_surface(

	struct dc_validation_set *val_sets,

	uint32_t set_count,

	const struct dc_stream *stream,

	const struct dc_stream_state *stream,

	struct dc_plane_state *surface)

{

	uint32_t i = 0, j = 0;
@@ -4399,8 +4401,8 @@ static uint32_t add_val_sets_surface( 
static uint32_t update_in_val_sets_stream(

	struct dc_validation_set *val_sets,

	uint32_t set_count,

	struct dc_stream *old_stream,

	struct dc_stream *new_stream,

	struct dc_stream_state *old_stream,

	struct dc_stream_state *new_stream,

	struct drm_crtc *crtc)

{

	uint32_t i = 0;
@@ -4423,7 +4425,7 @@ static uint32_t update_in_val_sets_stream( 
static uint32_t remove_from_val_sets(

	struct dc_validation_set *val_sets,

	uint32_t set_count,

	const struct dc_stream *stream)

	const struct dc_stream_state *stream)

{

	int i;
@@ -4545,7 +4547,7 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, 
	for_each_crtc_in_state(state, crtc, crtc_state, i) {

		struct amdgpu_crtc *acrtc = NULL;

		struct amdgpu_connector *aconnector = NULL;

		struct dc_stream *new_stream = NULL;

		struct dc_stream_state *new_stream = NULL;

		struct drm_connector_state *conn_state = NULL;

		struct dm_connector_state *dm_conn_state = NULL;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ struct dm_plane_state { 


struct dm_crtc_state {

	struct drm_crtc_state base;

	struct dc_stream *stream;

	struct dc_stream_state *stream;

};



#define to_dm_crtc_state(x)    container_of(x, struct dm_crtc_state, base)

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

+3 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static void get_payload_table( 
 */

bool dm_helpers_dp_mst_write_payload_allocation_table(

		struct dc_context *ctx,

		const struct dc_stream *stream,

		const struct dc_stream_state *stream,

		struct dp_mst_stream_allocation_table *proposed_table,

		bool enable)

{
@@ -264,7 +264,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( 
 */

bool dm_helpers_dp_mst_poll_for_allocation_change_trigger(

		struct dc_context *ctx,

		const struct dc_stream *stream)

		const struct dc_stream_state *stream)

{

	struct amdgpu_connector *aconnector;

	struct drm_dp_mst_topology_mgr *mst_mgr;
@@ -290,7 +290,7 @@ bool dm_helpers_dp_mst_poll_for_allocation_change_trigger( 


bool dm_helpers_dp_mst_send_payload_allocation(

		struct dc_context *ctx,

		const struct dc_stream *stream,

		const struct dc_stream_state *stream,

		bool enable)

{

	struct amdgpu_connector *aconnector;

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

+19 −19
Original line number Diff line number Diff line
@@ -149,12 +149,12 @@ static bool create_links( 
}



static bool stream_adjust_vmin_vmax(struct dc *dc,

		struct dc_stream **streams, int num_streams,

		struct dc_stream_state **streams, int num_streams,

		int vmin, int vmax)

{

	/* TODO: Support multiple streams */

	struct core_dc *core_dc = DC_TO_CORE(dc);

	struct dc_stream *stream = streams[0];

	struct dc_stream_state *stream = streams[0];

	int i = 0;

	bool ret = false;
@@ -175,12 +175,12 @@ static bool stream_adjust_vmin_vmax(struct dc *dc, 
}



static bool stream_get_crtc_position(struct dc *dc,

		struct dc_stream **streams, int num_streams,

		struct dc_stream_state **streams, int num_streams,

		unsigned int *v_pos, unsigned int *nom_v_pos)

{

	/* TODO: Support multiple streams */

	struct core_dc *core_dc = DC_TO_CORE(dc);

	struct dc_stream *stream = streams[0];

	struct dc_stream_state *stream = streams[0];

	int i = 0;

	bool ret = false;

	struct crtc_position position;
@@ -200,7 +200,7 @@ static bool stream_get_crtc_position(struct dc *dc, 
	return ret;

}



static bool set_gamut_remap(struct dc *dc, const struct dc_stream *stream)

static bool set_gamut_remap(struct dc *dc, const struct dc_stream_state *stream)

{

	struct core_dc *core_dc = DC_TO_CORE(dc);

	int i = 0;
@@ -218,7 +218,7 @@ static bool set_gamut_remap(struct dc *dc, const struct dc_stream *stream) 
	return ret;

}



static bool program_csc_matrix(struct dc *dc, struct dc_stream *stream)

static bool program_csc_matrix(struct dc *dc, struct dc_stream_state *stream)

{

	struct core_dc *core_dc = DC_TO_CORE(dc);

	int i = 0;
@@ -241,7 +241,7 @@ static bool program_csc_matrix(struct dc *dc, struct dc_stream *stream) 
}



static void set_static_screen_events(struct dc *dc,

		struct dc_stream **streams,

		struct dc_stream_state **streams,

		int num_streams,

		const struct dc_static_screen_events *events)

{
@@ -252,7 +252,7 @@ static void set_static_screen_events(struct dc *dc, 
	int num_pipes_affected = 0;



	for (i = 0; i < num_streams; i++) {

		struct dc_stream *stream = streams[i];

		struct dc_stream_state *stream = streams[i];



		for (j = 0; j < MAX_PIPES; j++) {

			if (core_dc->current_context->res_ctx.pipe_ctx[j].stream
@@ -333,7 +333,7 @@ static void set_test_pattern( 
			cust_pattern_size);

}



void set_dither_option(struct dc_stream *stream,

void set_dither_option(struct dc_stream_state *stream,

		enum dc_dither_option option)

{

	struct bit_depth_reduction_params params;
@@ -769,7 +769,7 @@ bool dc_validate_resources( 


bool dc_validate_guaranteed(

		const struct dc *dc,

		struct dc_stream *stream)

		struct dc_stream_state *stream)

{

	struct core_dc *core_dc = DC_TO_CORE(dc);

	enum dc_status result = DC_ERROR_UNEXPECTED;
@@ -893,7 +893,7 @@ static bool context_changed( 


static bool streams_changed(

		struct core_dc *dc,

		struct dc_stream *streams[],

		struct dc_stream_state *streams[],

		uint8_t stream_count)

{

	uint8_t i;
@@ -912,7 +912,7 @@ static bool streams_changed( 
bool dc_enable_stereo(

	struct dc *dc,

	struct validate_context *context,

	struct dc_stream *streams[],

	struct dc_stream_state *streams[],

	uint8_t stream_count)

{

	bool ret = true;
@@ -958,7 +958,7 @@ static bool dc_commit_context_no_check(struct dc *dc, struct validate_context *c 
	enum dc_status result = DC_ERROR_UNEXPECTED;

	struct pipe_ctx *pipe;

	int i, j, k, l;

	struct dc_stream *dc_streams[MAX_STREAMS] = {0};

	struct dc_stream_state *dc_streams[MAX_STREAMS] = {0};



	for (i = 0; i < context->stream_count; i++)

		dc_streams[i] =  context->streams[i];
@@ -1031,7 +1031,7 @@ bool dc_commit_context(struct dc *dc, struct validate_context *context) 
				__func__, context->stream_count);



	for (i = 0; i < context->stream_count; i++) {

		struct dc_stream *stream = context->streams[i];

		struct dc_stream_state *stream = context->streams[i];



		dc_stream_log(stream,

				core_dc->ctx->logger,
@@ -1046,7 +1046,7 @@ bool dc_commit_context(struct dc *dc, struct validate_context *context) 


bool dc_commit_streams(

	struct dc *dc,

	struct dc_stream *streams[],

	struct dc_stream_state *streams[],

	uint8_t stream_count)

{

	struct core_dc *core_dc = DC_TO_CORE(dc);
@@ -1062,7 +1062,7 @@ bool dc_commit_streams( 
				__func__, stream_count);



	for (i = 0; i < stream_count; i++) {

		struct dc_stream *stream = streams[i];

		struct dc_stream_state *stream = streams[i];

		struct dc_stream_status *status = dc_stream_get_status(stream);

		int j;
@@ -1138,7 +1138,7 @@ bool dc_commit_surfaces_to_stream( 
		struct dc *dc,

		struct dc_plane_state **new_surfaces,

		uint8_t new_surface_count,

		struct dc_stream *dc_stream)

		struct dc_stream_state *dc_stream)

{

	struct dc_surface_update updates[MAX_SURFACES];

	struct dc_flip_addrs flip_addr[MAX_SURFACES];
@@ -1395,7 +1395,7 @@ enum surface_update_type update_surface_trace_level = UPDATE_TYPE_FULL; 


void dc_update_surfaces_and_stream(struct dc *dc,

		struct dc_surface_update *srf_updates, int surface_count,

		struct dc_stream *stream,

		struct dc_stream_state *stream,

		struct dc_stream_update *stream_update)

{

	struct core_dc *core_dc = DC_TO_CORE(dc);
@@ -1723,7 +1723,7 @@ uint8_t dc_get_current_stream_count(const struct dc *dc) 
	return core_dc->current_context->stream_count;

}



struct dc_stream *dc_get_stream_at_index(const struct dc *dc, uint8_t i)

struct dc_stream_state *dc_get_stream_at_index(const struct dc *dc, uint8_t i)

{

	struct core_dc *core_dc = DC_TO_CORE(dc);

	if (i < core_dc->current_context->stream_count)

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

+9 −9
Original line number Diff line number Diff line
@@ -1143,7 +1143,7 @@ static void dpcd_configure_panel_mode( 


static void enable_stream_features(struct pipe_ctx *pipe_ctx)

{

	struct dc_stream *stream = pipe_ctx->stream;

	struct dc_stream_state *stream = pipe_ctx->stream;

	struct dc_link *link = stream->sink->link;

	union down_spread_ctrl downspread;
@@ -1159,7 +1159,7 @@ static void enable_stream_features(struct pipe_ctx *pipe_ctx) 


static enum dc_status enable_link_dp(struct pipe_ctx *pipe_ctx)

{

	struct dc_stream *stream = pipe_ctx->stream;

	struct dc_stream_state *stream = pipe_ctx->stream;

	enum dc_status status;

	bool skip_video_pattern;

	struct dc_link *link = stream->sink->link;
@@ -1250,7 +1250,7 @@ static enum dc_status enable_link_dp_mst(struct pipe_ctx *pipe_ctx) 


static void enable_link_hdmi(struct pipe_ctx *pipe_ctx)

{

	struct dc_stream *stream = pipe_ctx->stream;

	struct dc_stream_state *stream = pipe_ctx->stream;

	struct dc_link *link = stream->sink->link;

	enum dc_color_depth display_color_depth;
@@ -1341,7 +1341,7 @@ static void disable_link(struct dc_link *link, enum signal_type signal) 
}



enum dc_status dc_link_validate_mode_timing(

		const struct dc_stream *stream,

		const struct dc_stream_state *stream,

		struct dc_link *link,

		const struct dc_crtc_timing *timing)

{
@@ -1374,7 +1374,7 @@ enum dc_status dc_link_validate_mode_timing( 




bool dc_link_set_backlight_level(const struct dc_link *link, uint32_t level,

		uint32_t frame_ramp, const struct dc_stream *stream)

		uint32_t frame_ramp, const struct dc_stream_state *stream)

{

	struct core_dc *core_dc = DC_TO_CORE(link->ctx->dc);

	struct abm *abm = core_dc->res_pool->abm;
@@ -1450,7 +1450,7 @@ bool dc_link_get_psr_state(const struct dc_link *link, uint32_t *psr_state) 
}



bool dc_link_setup_psr(struct dc_link *link,

		const struct dc_stream *stream, struct psr_config *psr_config,

		const struct dc_stream_state *stream, struct psr_config *psr_config,

		struct psr_context *psr_context)

{

	struct core_dc *core_dc = DC_TO_CORE(link->ctx->dc);
@@ -1587,7 +1587,7 @@ void core_link_resume(struct dc_link *link) 
		program_hpd_filter(link);

}



static struct fixed31_32 get_pbn_per_slot(struct dc_stream *stream)

static struct fixed31_32 get_pbn_per_slot(struct dc_stream_state *stream)

{

	struct dc_link_settings *link_settings =

			&stream->sink->link->cur_link_settings;
@@ -1696,7 +1696,7 @@ static void update_mst_stream_alloc_table( 
 */

static enum dc_status allocate_mst_payload(struct pipe_ctx *pipe_ctx)

{

	struct dc_stream *stream = pipe_ctx->stream;

	struct dc_stream_state *stream = pipe_ctx->stream;

	struct dc_link *link = stream->sink->link;

	struct link_encoder *link_encoder = link->link_enc;

	struct stream_encoder *stream_encoder = pipe_ctx->stream_enc;
@@ -1778,7 +1778,7 @@ static enum dc_status allocate_mst_payload(struct pipe_ctx *pipe_ctx) 


static enum dc_status deallocate_mst_payload(struct pipe_ctx *pipe_ctx)

{

	struct dc_stream *stream = pipe_ctx->stream;

	struct dc_stream_state *stream = pipe_ctx->stream;

	struct dc_link *link = stream->sink->link;

	struct link_encoder *link_encoder = link->link_enc;

	struct stream_encoder *stream_encoder = pipe_ctx->stream_enc;