From: Harry Wentland <harry.wentland@amd.com>
Date: Wed, 3 May 2017 13:58:45 -0400
Subject: drm/amd/display: Assign stream to map before we need it
Git-commit: ba624cddbc002816e376d588290a48f77ff4b06f
Patch-mainline: v4.15-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/display/modules/freesync/freesync.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- 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_
struct core_stream *core_stream = NULL;
struct core_dc *core_dc = NULL;
struct core_freesync *core_freesync = NULL;
- int persistent_freesync_enable, stream_index = 0;
+ int persistent_freesync_enable = 0;
struct persistent_data_flag flag;
unsigned int nom_refresh_rate_micro_hz;
unsigned long long temp;
@@ -249,8 +249,6 @@ bool mod_freesync_add_stream(struct mod_
dc_stream_retain(stream);
- stream_index = map_index_from_stream(core_freesync, stream);
-
temp = stream->timing.pix_clk_khz;
temp *= 1000ULL * 1000ULL * 1000ULL;
temp = div_u64(temp, stream->timing.h_total);
@@ -260,7 +258,7 @@ bool mod_freesync_add_stream(struct mod_
if (core_freesync->opts.min_refresh_from_edid != 0 &&
dc_is_embedded_signal(
- stream[stream_index].sink->sink_signal)) {
+ stream->sink->sink_signal)) {
caps->supported = true;
caps->min_refresh_in_micro_hz =
core_freesync->opts.min_refresh_from_edid *