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

Revert "drm/amd/display: Use macro for invalid OPP ID"

This reverts commit 1760bd06c8e94e1b184139ae35201856403638cf.

Revert this to apply the version that includes DCN2 support.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Alex Deucher 1a1da391 ecbc382c

+4 -6
+2 -2
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
··· 63 63 } 64 64 65 65 hubp->mpcc_id = 0xf; 66 - hubp->opp_id = OPP_ID_INVALID; 66 + hubp->opp_id = 0xf; 67 67 } 68 68 } 69 69 ··· 1226 1226 hubp1->hubp_shift = hubp_shift; 1227 1227 hubp1->hubp_mask = hubp_mask; 1228 1228 hubp1->base.inst = inst; 1229 - hubp1->base.opp_id = OPP_ID_INVALID; 1229 + hubp1->base.opp_id = 0xf; 1230 1230 hubp1->base.mpcc_id = 0xf; 1231 1231 } 1232 1232
+2 -2
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
··· 1026 1026 pipe_ctx->plane_res.dpp = dpp; 1027 1027 pipe_ctx->plane_res.mpcc_inst = dpp->inst; 1028 1028 hubp->mpcc_id = dpp->inst; 1029 - hubp->opp_id = OPP_ID_INVALID; 1029 + hubp->opp_id = 0xf; 1030 1030 hubp->power_gated = false; 1031 1031 1032 1032 dc->res_pool->opps[i]->mpc_tree_params.opp_id = dc->res_pool->opps[i]->inst; ··· 2372 2372 if (pipe_ctx->plane_state && !old_pipe_ctx->plane_state) { 2373 2373 if (old_pipe_ctx->stream_res.tg == tg && 2374 2374 old_pipe_ctx->plane_res.hubp && 2375 - old_pipe_ctx->plane_res.hubp->opp_id != OPP_ID_INVALID) 2375 + old_pipe_ctx->plane_res.hubp->opp_id != 0xf) 2376 2376 dcn10_disable_plane(dc, old_pipe_ctx); 2377 2377 } 2378 2378
-2
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
··· 28 28 29 29 #include "mem_input.h" 30 30 31 - #define OPP_ID_INVALID 0xf 32 - 33 31 34 32 enum cursor_pitch { 35 33 CURSOR_PITCH_64_PIXELS = 0,