Commit ed6e2782 authored by Alvin Lee's avatar Alvin Lee Committed by Alex Deucher
Browse files

drm/amd/display: For cursor P-State allow for SubVP 



[Description]
- Similar to FPO, SubVP should also force cursor P-State
  allow instead of relying on natural assertion
- Implement code path to force and unforce cursor P-State
  allow for SubVP

Reviewed-by: default avatarSamson Tam <samson.tam@amd.com>
Acked-by: default avatarHersen Wu <hersenxs.wu@amd.com>
Signed-off-by: default avatarAlvin Lee <alvin.lee2@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e4c33fff

drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c

+2 −15
Original line number Diff line number Diff line
@@ -615,12 +615,6 @@ void dcn32_update_force_pstate(struct dc *dc, struct dc_state *context) 
		    pipe->stream->fpo_in_use)) {

			if (hubp && hubp->funcs->hubp_update_force_pstate_disallow)

				hubp->funcs->hubp_update_force_pstate_disallow(hubp, false);

		}



		/* Today only FPO uses cursor P-State force. Only clear cursor P-State force

		 * if it's not FPO.

		 */

		if (!pipe->stream || !pipe->stream->fpo_in_use) {

			if (hubp && hubp->funcs->hubp_update_force_cursor_pstate_disallow)

				hubp->funcs->hubp_update_force_cursor_pstate_disallow(hubp, false);

		}
@@ -632,17 +626,10 @@ void dcn32_update_force_pstate(struct dc *dc, struct dc_state *context) 
		struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];

		struct hubp *hubp = pipe->plane_res.hubp;



		if (pipe->stream && pipe->plane_state && pipe->stream->mall_stream_config.type == SUBVP_MAIN) {

			if (hubp && hubp->funcs->hubp_update_force_pstate_disallow)

				hubp->funcs->hubp_update_force_pstate_disallow(hubp, true);

		}



		if (pipe->stream && pipe->stream->fpo_in_use) {

		if (pipe->stream && (pipe->stream->mall_stream_config.type == SUBVP_MAIN ||

				pipe->stream->fpo_in_use)) {

			if (hubp && hubp->funcs->hubp_update_force_pstate_disallow)

				hubp->funcs->hubp_update_force_pstate_disallow(hubp, true);

			/* For now only force cursor p-state disallow for FPO

			 * Needs to be added for subvp once FW side gets updated

			 */

			if (hubp && hubp->funcs->hubp_update_force_cursor_pstate_disallow)

				hubp->funcs->hubp_update_force_cursor_pstate_disallow(hubp, true);

		}