iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 1760bd06c8e94e1b184139ae35201856403638cf.

Revert this to apply the version that includes DCN2 support.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2019-06-17 13:08:58 -05:00
parent ecbc382c9f
commit 1a1da391c9
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
View File

@ -63,7 +63,7 @@ void hubp1_set_blank(struct hubp *hubp, bool blank)
} }
hubp->mpcc_id = 0xf; hubp->mpcc_id = 0xf;
hubp->opp_id = OPP_ID_INVALID; hubp->opp_id = 0xf;
} }
} }
@ -1226,7 +1226,7 @@ void dcn10_hubp_construct(
hubp1->hubp_shift = hubp_shift; hubp1->hubp_shift = hubp_shift;
hubp1->hubp_mask = hubp_mask; hubp1->hubp_mask = hubp_mask;
hubp1->base.inst = inst; hubp1->base.inst = inst;
hubp1->base.opp_id = OPP_ID_INVALID; hubp1->base.opp_id = 0xf;
hubp1->base.mpcc_id = 0xf; hubp1->base.mpcc_id = 0xf;
} }

4
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
View File

@ -1026,7 +1026,7 @@ static void dcn10_init_pipes(struct dc *dc, struct dc_state *context)
pipe_ctx->plane_res.dpp = dpp; pipe_ctx->plane_res.dpp = dpp;
pipe_ctx->plane_res.mpcc_inst = dpp->inst; pipe_ctx->plane_res.mpcc_inst = dpp->inst;
hubp->mpcc_id = dpp->inst; hubp->mpcc_id = dpp->inst;
hubp->opp_id = OPP_ID_INVALID; hubp->opp_id = 0xf;
hubp->power_gated = false; hubp->power_gated = false;
dc->res_pool->opps[i]->mpc_tree_params.opp_id = dc->res_pool->opps[i]->inst; dc->res_pool->opps[i]->mpc_tree_params.opp_id = dc->res_pool->opps[i]->inst;
@ -2372,7 +2372,7 @@ static void dcn10_apply_ctx_for_surface(
if (pipe_ctx->plane_state && !old_pipe_ctx->plane_state) { if (pipe_ctx->plane_state && !old_pipe_ctx->plane_state) {
if (old_pipe_ctx->stream_res.tg == tg && if (old_pipe_ctx->stream_res.tg == tg &&
old_pipe_ctx->plane_res.hubp && old_pipe_ctx->plane_res.hubp &&
old_pipe_ctx->plane_res.hubp->opp_id != OPP_ID_INVALID) old_pipe_ctx->plane_res.hubp->opp_id != 0xf)
dcn10_disable_plane(dc, old_pipe_ctx); dcn10_disable_plane(dc, old_pipe_ctx);
} }

2
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
View File

@ -28,8 +28,6 @@
#include "mem_input.h" #include "mem_input.h"
#define OPP_ID_INVALID 0xf
enum cursor_pitch { enum cursor_pitch {
CURSOR_PITCH_64_PIXELS = 0, CURSOR_PITCH_64_PIXELS = 0,