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: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Alex Deucher
parent
c9614aeb12
commit
0971c40e18
@ -111,7 +111,7 @@ struct freesync_state {
|
||||
};
|
||||
|
||||
struct freesync_entity {
|
||||
struct dc_stream *stream;
|
||||
struct dc_stream_state *stream;
|
||||
struct mod_freesync_caps *caps;
|
||||
struct freesync_state state;
|
||||
struct mod_freesync_user_enable user_enable;
|
||||
@ -229,7 +229,7 @@ void mod_freesync_destroy(struct mod_freesync *mod_freesync)
|
||||
* on the core_freesync->map and returns the corresponding index
|
||||
*/
|
||||
static unsigned int map_index_from_stream(struct core_freesync *core_freesync,
|
||||
struct dc_stream *stream)
|
||||
struct dc_stream_state *stream)
|
||||
{
|
||||
unsigned int index = 0;
|
||||
|
||||
@ -244,7 +244,7 @@ static unsigned int map_index_from_stream(struct core_freesync *core_freesync,
|
||||
}
|
||||
|
||||
bool mod_freesync_add_stream(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream *stream, struct mod_freesync_caps *caps)
|
||||
struct dc_stream_state *stream, struct mod_freesync_caps *caps)
|
||||
{
|
||||
struct core_dc *core_dc = NULL;
|
||||
struct core_freesync *core_freesync = NULL;
|
||||
@ -322,7 +322,7 @@ bool mod_freesync_add_stream(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
bool mod_freesync_remove_stream(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream *stream)
|
||||
struct dc_stream_state *stream)
|
||||
{
|
||||
int i = 0;
|
||||
struct core_freesync *core_freesync = NULL;
|
||||
@ -344,7 +344,7 @@ bool mod_freesync_remove_stream(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
static void update_stream_freesync_context(struct core_freesync *core_freesync,
|
||||
struct dc_stream *stream)
|
||||
struct dc_stream_state *stream)
|
||||
{
|
||||
unsigned int index;
|
||||
struct freesync_context *ctx;
|
||||
@ -368,7 +368,7 @@ static void update_stream_freesync_context(struct core_freesync *core_freesync,
|
||||
}
|
||||
|
||||
static void update_stream(struct core_freesync *core_freesync,
|
||||
struct dc_stream *stream)
|
||||
struct dc_stream_state *stream)
|
||||
{
|
||||
unsigned int index = map_index_from_stream(core_freesync, stream);
|
||||
if (core_freesync->map[index].caps->supported) {
|
||||
@ -378,7 +378,7 @@ static void update_stream(struct core_freesync *core_freesync,
|
||||
}
|
||||
|
||||
static void calc_freesync_range(struct core_freesync *core_freesync,
|
||||
struct dc_stream *stream,
|
||||
struct dc_stream_state *stream,
|
||||
struct freesync_state *state,
|
||||
unsigned int min_refresh_in_uhz,
|
||||
unsigned int max_refresh_in_uhz)
|
||||
@ -452,7 +452,7 @@ static void calc_freesync_range(struct core_freesync *core_freesync,
|
||||
min_frame_duration_in_ns) / 2000;
|
||||
}
|
||||
|
||||
static void calc_v_total_from_duration(struct dc_stream *stream,
|
||||
static void calc_v_total_from_duration(struct dc_stream_state *stream,
|
||||
unsigned int duration_in_ns, int *v_total_nominal)
|
||||
{
|
||||
*v_total_nominal = div64_u64(div64_u64(((unsigned long long)(
|
||||
@ -461,7 +461,7 @@ static void calc_v_total_from_duration(struct dc_stream *stream,
|
||||
}
|
||||
|
||||
static void calc_v_total_for_static_ramp(struct core_freesync *core_freesync,
|
||||
struct dc_stream *stream,
|
||||
struct dc_stream_state *stream,
|
||||
unsigned int index, int *v_total)
|
||||
{
|
||||
unsigned int frame_duration = 0;
|
||||
@ -557,7 +557,7 @@ static void reset_freesync_state_variables(struct freesync_state* state)
|
||||
* Sets freesync mode on a stream depending on current freesync state.
|
||||
*/
|
||||
static bool set_freesync_on_streams(struct core_freesync *core_freesync,
|
||||
struct dc_stream **streams, int num_streams)
|
||||
struct dc_stream_state **streams, int num_streams)
|
||||
{
|
||||
int v_total_nominal = 0, v_total_min = 0, v_total_max = 0;
|
||||
unsigned int stream_idx, map_index = 0;
|
||||
@ -729,7 +729,7 @@ static void set_static_ramp_variables(struct core_freesync *core_freesync,
|
||||
}
|
||||
|
||||
void mod_freesync_handle_v_update(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream **streams, int num_streams)
|
||||
struct dc_stream_state **streams, int num_streams)
|
||||
{
|
||||
unsigned int index, v_total, inserted_frame_v_total = 0;
|
||||
unsigned int min_frame_duration_in_ns, vmax, vmin = 0;
|
||||
@ -839,7 +839,7 @@ void mod_freesync_handle_v_update(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
void mod_freesync_update_state(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream **streams, int num_streams,
|
||||
struct dc_stream_state **streams, int num_streams,
|
||||
struct mod_freesync_params *freesync_params)
|
||||
{
|
||||
bool freesync_program_required = false;
|
||||
@ -929,7 +929,7 @@ void mod_freesync_update_state(struct mod_freesync *mod_freesync,
|
||||
|
||||
|
||||
bool mod_freesync_get_state(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream *stream,
|
||||
struct dc_stream_state *stream,
|
||||
struct mod_freesync_params *freesync_params)
|
||||
{
|
||||
unsigned int index = 0;
|
||||
@ -965,7 +965,7 @@ bool mod_freesync_get_state(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
bool mod_freesync_set_user_enable(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream **streams, int num_streams,
|
||||
struct dc_stream_state **streams, int num_streams,
|
||||
struct mod_freesync_user_enable *user_enable)
|
||||
{
|
||||
unsigned int stream_index, map_index;
|
||||
@ -1017,7 +1017,7 @@ bool mod_freesync_set_user_enable(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
bool mod_freesync_get_user_enable(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream *stream,
|
||||
struct dc_stream_state *stream,
|
||||
struct mod_freesync_user_enable *user_enable)
|
||||
{
|
||||
unsigned int index = 0;
|
||||
@ -1035,7 +1035,7 @@ bool mod_freesync_get_user_enable(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
bool mod_freesync_get_static_ramp_active(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream *stream,
|
||||
struct dc_stream_state *stream,
|
||||
bool *is_ramp_active)
|
||||
{
|
||||
unsigned int index = 0;
|
||||
@ -1054,7 +1054,7 @@ bool mod_freesync_get_static_ramp_active(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
bool mod_freesync_override_min_max(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream *streams,
|
||||
struct dc_stream_state *streams,
|
||||
unsigned int min_refresh,
|
||||
unsigned int max_refresh,
|
||||
struct mod_freesync_caps *caps)
|
||||
@ -1107,7 +1107,7 @@ bool mod_freesync_override_min_max(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
bool mod_freesync_get_min_max(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream *stream,
|
||||
struct dc_stream_state *stream,
|
||||
unsigned int *min_refresh,
|
||||
unsigned int *max_refresh)
|
||||
{
|
||||
@ -1129,7 +1129,7 @@ bool mod_freesync_get_min_max(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
bool mod_freesync_get_vmin_vmax(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream *stream,
|
||||
struct dc_stream_state *stream,
|
||||
unsigned int *vmin,
|
||||
unsigned int *vmax)
|
||||
{
|
||||
@ -1151,7 +1151,7 @@ bool mod_freesync_get_vmin_vmax(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
bool mod_freesync_get_v_position(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream *stream,
|
||||
struct dc_stream_state *stream,
|
||||
unsigned int *nom_v_pos,
|
||||
unsigned int *v_pos)
|
||||
{
|
||||
@ -1179,7 +1179,7 @@ bool mod_freesync_get_v_position(struct mod_freesync *mod_freesync,
|
||||
}
|
||||
|
||||
void mod_freesync_notify_mode_change(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream **streams, int num_streams)
|
||||
struct dc_stream_state **streams, int num_streams)
|
||||
{
|
||||
unsigned int stream_index, map_index;
|
||||
struct freesync_state *state;
|
||||
@ -1239,7 +1239,7 @@ void mod_freesync_notify_mode_change(struct mod_freesync *mod_freesync,
|
||||
* is required, depending on the times calculated
|
||||
*/
|
||||
static void update_timestamps(struct core_freesync *core_freesync,
|
||||
const struct dc_stream *stream, unsigned int map_index,
|
||||
const struct dc_stream_state *stream, unsigned int map_index,
|
||||
unsigned int last_render_time_in_us)
|
||||
{
|
||||
struct freesync_state *state = &core_freesync->map[map_index].state;
|
||||
@ -1304,7 +1304,7 @@ static void update_timestamps(struct core_freesync *core_freesync,
|
||||
}
|
||||
|
||||
static void apply_below_the_range(struct core_freesync *core_freesync,
|
||||
struct dc_stream *stream, unsigned int map_index,
|
||||
struct dc_stream_state *stream, unsigned int map_index,
|
||||
unsigned int last_render_time_in_us)
|
||||
{
|
||||
unsigned int inserted_frame_duration_in_us = 0;
|
||||
@ -1403,7 +1403,7 @@ static void apply_below_the_range(struct core_freesync *core_freesync,
|
||||
}
|
||||
|
||||
static void apply_fixed_refresh(struct core_freesync *core_freesync,
|
||||
struct dc_stream *stream, unsigned int map_index)
|
||||
struct dc_stream_state *stream, unsigned int map_index)
|
||||
{
|
||||
unsigned int vmin = 0, vmax = 0;
|
||||
struct freesync_state *state = &core_freesync->map[map_index].state;
|
||||
@ -1434,7 +1434,7 @@ static void apply_fixed_refresh(struct core_freesync *core_freesync,
|
||||
}
|
||||
|
||||
void mod_freesync_pre_update_plane_addresses(struct mod_freesync *mod_freesync,
|
||||
struct dc_stream **streams, int num_streams,
|
||||
struct dc_stream_state **streams, int num_streams,
|
||||
unsigned int curr_time_stamp_in_us)
|
||||
{
|
||||
unsigned int stream_index, map_index, last_render_time_in_us = 0;
|
||||
|
Reference in New Issue
Block a user