Commit 043f5bb6 authored by Wesley Chalmers's avatar Wesley Chalmers Committed by Alex Deucher
Browse files

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



[WHY]
This is meant to make it clearer that 0xf is not a valid OPP ID, and
that code making use of OPP IDs should not accept this value.

Signed-off-by: default avatarWesley Chalmers <Wesley.Chalmers@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c5509aad

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void hubp1_set_blank(struct hubp *hubp, bool blank) 
		}



		hubp->mpcc_id = 0xf;

		hubp->opp_id = 0xf;

		hubp->opp_id = OPP_ID_INVALID;

	}

}
@@ -1253,7 +1253,7 @@ void dcn10_hubp_construct( 
	hubp1->hubp_shift = hubp_shift;

	hubp1->hubp_mask = hubp_mask;

	hubp1->base.inst = inst;

	hubp1->base.opp_id = 0xf;

	hubp1->base.opp_id = OPP_ID_INVALID;

	hubp1->base.mpcc_id = 0xf;

}

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+2 −2
Original line number Diff line number Diff line
@@ -1086,7 +1086,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 = 0xf;

		hubp->opp_id = OPP_ID_INVALID;

		hubp->power_gated = false;



		dc->res_pool->opps[i]->mpc_tree_params.opp_id = dc->res_pool->opps[i]->inst;
@@ -2437,7 +2437,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 != 0xf)

			    old_pipe_ctx->plane_res.hubp->opp_id != OPP_ID_INVALID)

				dcn10_disable_plane(dc, old_pipe_ctx);

		}

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ bool hubp2_construct( 
	hubp2->hubp_shift = hubp_shift;

	hubp2->hubp_mask = hubp_mask;

	hubp2->base.inst = inst;

	hubp2->base.opp_id = 0xf;

	hubp2->base.opp_id = OPP_ID_INVALID;

	hubp2->base.mpcc_id = 0xf;



	return true;

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c

+2 −2
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static void dcn20_init_hw(struct dc *dc) 
		pipe_ctx->plane_res.dpp = dpp;

		pipe_ctx->plane_res.mpcc_inst = dpp->inst;

		hubp->mpcc_id = dpp->inst;

		hubp->opp_id = 0xf;

		hubp->opp_id = OPP_ID_INVALID;

		hubp->power_gated = false;

		pipe_ctx->stream_res.opp = NULL;
@@ -1307,7 +1307,7 @@ static void dcn20_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 != 0xf)

			    old_pipe_ctx->plane_res.hubp->opp_id != OPP_ID_INVALID)

				dcn20_disable_plane(dc, old_pipe_ctx);

		}

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 


#include "mem_input.h"



#define OPP_ID_INVALID 0xf





enum cursor_pitch {

	CURSOR_PITCH_64_PIXELS = 0,

CRA Git | Maintained and supported by SUSTech CRA and CCSE