Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "drm/amd/display: New path for enabling DPG"

This reverts commit f8e792dc5c45d306a542b9ee991ae80e1c78e4c5

[Why]
We are not implementing the planned new HW
sequence for HUBP disable.

[How]
Revert most related changes to minimize regressions.

Signed-off-by: Wesley Chalmers <Wesley.Chalmers@amd.com>
Reviewed-by: Martin Leung <Martin.Leung@amd.com>
Acked-by: Qingqing Zhuo <Qingqing.Zhuo@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Wesley Chalmers and committed by
Alex Deucher
29249676 99929cf0

-22
-11
drivers/gpu/drm/amd/display/dc/core/dc.c
··· 2284 2284 if (update->dither_option) 2285 2285 stream->dither_option = *update->dither_option; 2286 2286 2287 - if (update->pending_test_pattern) 2288 - stream->test_pattern = *update->pending_test_pattern; 2289 2287 /* update current stream with writeback info */ 2290 2288 if (update->wb_update) { 2291 2289 int i; ··· 2378 2380 &stream->clamping); 2379 2381 odm_pipe = odm_pipe->next_odm_pipe; 2380 2382 } 2381 - } 2382 - 2383 - if (stream_update->pending_test_pattern) { 2384 - dc_link_dp_set_test_pattern(stream->link, 2385 - stream->test_pattern.type, 2386 - stream->test_pattern.color_space, 2387 - stream->test_pattern.p_link_settings, 2388 - stream->test_pattern.p_custom_pattern, 2389 - stream->test_pattern.cust_pattern_size); 2390 2383 } 2391 2384 2392 2385 /* Full fe update*/
-11
drivers/gpu/drm/amd/display/dc/dc_stream.h
··· 130 130 uint32_t raw; 131 131 }; 132 132 133 - struct test_pattern { 134 - enum dp_test_pattern type; 135 - enum dp_test_pattern_color_space color_space; 136 - struct link_training_settings const *p_link_settings; 137 - unsigned char const *p_custom_pattern; 138 - unsigned int cust_pattern_size; 139 - }; 140 - 141 133 struct dc_stream_state { 142 134 // sink is deprecated, new code should not reference 143 135 // this pointer ··· 227 235 228 236 uint32_t stream_id; 229 237 bool is_dsc_enabled; 230 - 231 - struct test_pattern test_pattern; 232 238 union stream_update_flags update_flags; 233 239 }; 234 240 ··· 261 271 struct dc_dsc_config *dsc_config; 262 272 struct dc_transfer_func *func_shaper; 263 273 struct dc_3dlut *lut3d_func; 264 - struct test_pattern *pending_test_pattern; 265 274 }; 266 275 267 276 bool dc_is_stream_unchanged(