diff options
author | Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> | 2017-08-23 15:44:42 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:17:07 -0400 |
commit | 156590454259a19d1709fab2ff7d59870574e822 (patch) | |
tree | 0e2a6dfa0667c2d1a4914a6f4048f85c59f0bae8 /drivers/gpu/drm/amd/display/modules/freesync/freesync.c | |
parent | 9635b75436e5f536831c810c715f3ae24a5bbbae (diff) |
drm/amd/display: Clean up flattening core_dc to dc
Clean up some code related to flattening core_dc commit
(Remove redundent dc = dc, which was the result of removing
DC_TO_CORE() macro)
Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-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 | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c index f49203b3eb94..52350d0e68d0 100644 --- a/drivers/gpu/drm/amd/display/modules/freesync/freesync.c +++ b/drivers/gpu/drm/amd/display/modules/freesync/freesync.c | |||
@@ -145,7 +145,6 @@ struct mod_freesync *mod_freesync_create(struct dc *dc) | |||
145 | struct core_freesync *core_freesync = | 145 | struct core_freesync *core_freesync = |
146 | dm_alloc(sizeof(struct core_freesync)); | 146 | dm_alloc(sizeof(struct core_freesync)); |
147 | 147 | ||
148 | struct dc *core_dc = dc; | ||
149 | 148 | ||
150 | struct persistent_data_flag flag; | 149 | struct persistent_data_flag flag; |
151 | 150 | ||
@@ -176,19 +175,19 @@ struct mod_freesync *mod_freesync_create(struct dc *dc) | |||
176 | /* Create initial module folder in registry for freesync enable data */ | 175 | /* Create initial module folder in registry for freesync enable data */ |
177 | flag.save_per_edid = true; | 176 | flag.save_per_edid = true; |
178 | flag.save_per_link = false; | 177 | flag.save_per_link = false; |
179 | dm_write_persistent_data(core_dc->ctx, NULL, FREESYNC_REGISTRY_NAME, | 178 | dm_write_persistent_data(dc->ctx, NULL, FREESYNC_REGISTRY_NAME, |
180 | NULL, NULL, 0, &flag); | 179 | NULL, NULL, 0, &flag); |
181 | flag.save_per_edid = false; | 180 | flag.save_per_edid = false; |
182 | flag.save_per_link = false; | 181 | flag.save_per_link = false; |
183 | 182 | ||
184 | if (dm_read_persistent_data(core_dc->ctx, NULL, NULL, | 183 | if (dm_read_persistent_data(dc->ctx, NULL, NULL, |
185 | FREESYNC_NO_STATIC_FOR_INTERNAL_REGKEY, | 184 | FREESYNC_NO_STATIC_FOR_INTERNAL_REGKEY, |
186 | &data, sizeof(data), &flag)) { | 185 | &data, sizeof(data), &flag)) { |
187 | core_freesync->opts.drr_internal_supported = | 186 | core_freesync->opts.drr_internal_supported = |
188 | (data & 1) ? false : true; | 187 | (data & 1) ? false : true; |
189 | } | 188 | } |
190 | 189 | ||
191 | if (dm_read_persistent_data(core_dc->ctx, NULL, NULL, | 190 | if (dm_read_persistent_data(dc->ctx, NULL, NULL, |
192 | FREESYNC_NO_STATIC_FOR_EXTERNAL_DP_REGKEY, | 191 | FREESYNC_NO_STATIC_FOR_EXTERNAL_DP_REGKEY, |
193 | &data, sizeof(data), &flag)) { | 192 | &data, sizeof(data), &flag)) { |
194 | core_freesync->opts.drr_external_supported = | 193 | core_freesync->opts.drr_external_supported = |
@@ -245,7 +244,7 @@ static unsigned int map_index_from_stream(struct core_freesync *core_freesync, | |||
245 | bool mod_freesync_add_stream(struct mod_freesync *mod_freesync, | 244 | bool mod_freesync_add_stream(struct mod_freesync *mod_freesync, |
246 | struct dc_stream_state *stream, struct mod_freesync_caps *caps) | 245 | struct dc_stream_state *stream, struct mod_freesync_caps *caps) |
247 | { | 246 | { |
248 | struct dc *core_dc = NULL; | 247 | struct dc *dc = NULL; |
249 | struct core_freesync *core_freesync = NULL; | 248 | struct core_freesync *core_freesync = NULL; |
250 | int persistent_freesync_enable = 0; | 249 | int persistent_freesync_enable = 0; |
251 | struct persistent_data_flag flag; | 250 | struct persistent_data_flag flag; |
@@ -256,7 +255,7 @@ bool mod_freesync_add_stream(struct mod_freesync *mod_freesync, | |||
256 | return false; | 255 | return false; |
257 | 256 | ||
258 | core_freesync = MOD_FREESYNC_TO_CORE(mod_freesync); | 257 | core_freesync = MOD_FREESYNC_TO_CORE(mod_freesync); |
259 | core_dc = core_freesync->dc; | 258 | dc = core_freesync->dc; |
260 | 259 | ||
261 | flag.save_per_edid = true; | 260 | flag.save_per_edid = true; |
262 | flag.save_per_link = false; | 261 | flag.save_per_link = false; |
@@ -287,7 +286,7 @@ bool mod_freesync_add_stream(struct mod_freesync *mod_freesync, | |||
287 | static_ramp.ramp_is_active = false; | 286 | static_ramp.ramp_is_active = false; |
288 | 287 | ||
289 | /* get persistent data from registry */ | 288 | /* get persistent data from registry */ |
290 | if (dm_read_persistent_data(core_dc->ctx, stream->sink, | 289 | if (dm_read_persistent_data(dc->ctx, stream->sink, |
291 | FREESYNC_REGISTRY_NAME, | 290 | FREESYNC_REGISTRY_NAME, |
292 | "userenable", &persistent_freesync_enable, | 291 | "userenable", &persistent_freesync_enable, |
293 | sizeof(int), &flag)) { | 292 | sizeof(int), &flag)) { |
@@ -970,14 +969,14 @@ bool mod_freesync_set_user_enable(struct mod_freesync *mod_freesync, | |||
970 | unsigned int stream_index, map_index; | 969 | unsigned int stream_index, map_index; |
971 | int persistent_data = 0; | 970 | int persistent_data = 0; |
972 | struct persistent_data_flag flag; | 971 | struct persistent_data_flag flag; |
973 | struct dc *core_dc = NULL; | 972 | struct dc *dc = NULL; |
974 | struct core_freesync *core_freesync = NULL; | 973 | struct core_freesync *core_freesync = NULL; |
975 | 974 | ||
976 | if (mod_freesync == NULL) | 975 | if (mod_freesync == NULL) |
977 | return false; | 976 | return false; |
978 | 977 | ||
979 | core_freesync = MOD_FREESYNC_TO_CORE(mod_freesync); | 978 | core_freesync = MOD_FREESYNC_TO_CORE(mod_freesync); |
980 | core_dc = core_freesync->dc; | 979 | dc = core_freesync->dc; |
981 | 980 | ||
982 | flag.save_per_edid = true; | 981 | flag.save_per_edid = true; |
983 | flag.save_per_link = false; | 982 | flag.save_per_link = false; |
@@ -1001,7 +1000,7 @@ bool mod_freesync_set_user_enable(struct mod_freesync *mod_freesync, | |||
1001 | enable_for_video) | 1000 | enable_for_video) |
1002 | persistent_data = persistent_data | 4; | 1001 | persistent_data = persistent_data | 4; |
1003 | 1002 | ||
1004 | dm_write_persistent_data(core_dc->ctx, | 1003 | dm_write_persistent_data(dc->ctx, |
1005 | streams[stream_index]->sink, | 1004 | streams[stream_index]->sink, |
1006 | FREESYNC_REGISTRY_NAME, | 1005 | FREESYNC_REGISTRY_NAME, |
1007 | "userenable", | 1006 | "userenable", |