diff options
author | Harry Wentland <harry.wentland@amd.com> | 2017-05-03 13:58:45 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:06:46 -0400 |
commit | ba624cddbc002816e376d588290a48f77ff4b06f (patch) | |
tree | 90cd146aac572b9fc4cf5c07499ab06b5e4e7c53 /drivers/gpu/drm/amd/display/modules/freesync/freesync.c | |
parent | 7d091f7a4466cd7d7b778c126072b3dc46d8141f (diff) |
drm/amd/display: Assign stream to map before we need it
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/modules/freesync/freesync.c')
-rw-r--r-- | drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c index 82086a129a3b..c5330f3cc1de 100644 --- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c | |||
@@ -230,7 +230,7 @@ bool mod_freesync_add_stream(struct mod_freesync *mod_freesync, | |||
230 | struct core_stream *core_stream = NULL; | 230 | struct core_stream *core_stream = NULL; |
231 | struct core_dc *core_dc = NULL; | 231 | struct core_dc *core_dc = NULL; |
232 | struct core_freesync *core_freesync = NULL; | 232 | struct core_freesync *core_freesync = NULL; |
233 | int persistent_freesync_enable, stream_index = 0; | 233 | int persistent_freesync_enable = 0; |
234 | struct persistent_data_flag flag; | 234 | struct persistent_data_flag flag; |
235 | unsigned int nom_refresh_rate_micro_hz; | 235 | unsigned int nom_refresh_rate_micro_hz; |
236 | unsigned long long temp; | 236 | unsigned long long temp; |
@@ -249,8 +249,6 @@ bool mod_freesync_add_stream(struct mod_freesync *mod_freesync, | |||
249 | 249 | ||
250 | dc_stream_retain(stream); | 250 | dc_stream_retain(stream); |
251 | 251 | ||
252 | stream_index = map_index_from_stream(core_freesync, stream); | ||
253 | |||
254 | temp = stream->timing.pix_clk_khz; | 252 | temp = stream->timing.pix_clk_khz; |
255 | temp *= 1000ULL * 1000ULL * 1000ULL; | 253 | temp *= 1000ULL * 1000ULL * 1000ULL; |
256 | temp = div_u64(temp, stream->timing.h_total); | 254 | temp = div_u64(temp, stream->timing.h_total); |
@@ -260,7 +258,7 @@ bool mod_freesync_add_stream(struct mod_freesync *mod_freesync, | |||
260 | 258 | ||
261 | if (core_freesync->opts.min_refresh_from_edid != 0 && | 259 | if (core_freesync->opts.min_refresh_from_edid != 0 && |
262 | dc_is_embedded_signal( | 260 | dc_is_embedded_signal( |
263 | stream[stream_index].sink->sink_signal)) { | 261 | stream->sink->sink_signal)) { |
264 | caps->supported = true; | 262 | caps->supported = true; |
265 | caps->min_refresh_in_micro_hz = | 263 | caps->min_refresh_in_micro_hz = |
266 | core_freesync->opts.min_refresh_from_edid * | 264 | core_freesync->opts.min_refresh_from_edid * |