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>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
index aea2b63db137d8eeb4841b24ae27686e69ddb22e..54b219a710d8729c509a12ab0dad8a0037c424a1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c
@@ -63,7 +63,7 @@ void hubp1_set_blank(struct hubp *hubp, bool blank)
                }
 
                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_mask = hubp_mask;
        hubp1->base.inst = inst;
-       hubp1->base.opp_id = OPP_ID_INVALID;
+       hubp1->base.opp_id = 0xf;
        hubp1->base.mpcc_id = 0xf;
 }
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index 0921858675e7cf263626649292988985fd34482a..1673d3596305cba6f94e57d05abd898680cc24a8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -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.mpcc_inst = dpp->inst;
                hubp->mpcc_id = dpp->inst;
-               hubp->opp_id = OPP_ID_INVALID;
+               hubp->opp_id = 0xf;
                hubp->power_gated = false;
 
                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 (old_pipe_ctx->stream_res.tg == tg &&
                            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);
                }
 

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
index 5420ad2da96fee07763b20442736b7867b686734..455df4999797f21797426ea20e2a156ce57070a7 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h
@@ -28,8 +28,6 @@
 
 #include "mem_input.h"
 
-#define OPP_ID_INVALID 0xf
-
 
 enum cursor_pitch {
        CURSOR_PITCH_64_PIXELS = 0,