mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
drm/amd/display: Move address tracking out of HUBP
[Why] We sometime require remapping of FB address space to UMA [How] Move address tracking up a layer before we apply address translation Signed-off-by: Tony Cheng <tony.cheng@amd.com> Reviewed-by: Charlene Liu <Charlene.Liu@amd.com> Acked-by: Leo Li <sunpeng.li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
2068afe649
commit
68199bd16c
3 changed files with 15 additions and 9 deletions
|
@ -457,9 +457,6 @@ bool hubp1_program_surface_flip_and_addr(
|
|||
|
||||
hubp->request_address = *address;
|
||||
|
||||
if (flip_immediate)
|
||||
hubp->current_address = *address;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -695,7 +692,6 @@ bool hubp1_is_flip_pending(struct hubp *hubp)
|
|||
if (earliest_inuse_address.grph.addr.quad_part != hubp->request_address.grph.addr.quad_part)
|
||||
return true;
|
||||
|
||||
hubp->current_address = hubp->request_address;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -1157,12 +1157,19 @@ static void dcn10_update_plane_addr(const struct dc *dc, struct pipe_ctx *pipe_c
|
|||
|
||||
if (plane_state == NULL)
|
||||
return;
|
||||
|
||||
addr_patched = patch_address_for_sbs_tb_stereo(pipe_ctx, &addr);
|
||||
|
||||
pipe_ctx->plane_res.hubp->funcs->hubp_program_surface_flip_and_addr(
|
||||
pipe_ctx->plane_res.hubp,
|
||||
&plane_state->address,
|
||||
plane_state->flip_immediate);
|
||||
|
||||
plane_state->status.requested_address = plane_state->address;
|
||||
|
||||
if (plane_state->flip_immediate)
|
||||
plane_state->status.current_address = plane_state->address;
|
||||
|
||||
if (addr_patched)
|
||||
pipe_ctx->plane_state->address.grph_stereo.left_addr = addr;
|
||||
}
|
||||
|
@ -2533,16 +2540,20 @@ static void dcn10_update_pending_status(struct pipe_ctx *pipe_ctx)
|
|||
{
|
||||
struct dc_plane_state *plane_state = pipe_ctx->plane_state;
|
||||
struct timing_generator *tg = pipe_ctx->stream_res.tg;
|
||||
bool flip_pending;
|
||||
|
||||
if (plane_state == NULL)
|
||||
return;
|
||||
|
||||
plane_state->status.is_flip_pending =
|
||||
pipe_ctx->plane_res.hubp->funcs->hubp_is_flip_pending(
|
||||
flip_pending = pipe_ctx->plane_res.hubp->funcs->hubp_is_flip_pending(
|
||||
pipe_ctx->plane_res.hubp);
|
||||
|
||||
plane_state->status.current_address = pipe_ctx->plane_res.hubp->current_address;
|
||||
if (pipe_ctx->plane_res.hubp->current_address.type == PLN_ADDR_TYPE_GRPH_STEREO &&
|
||||
plane_state->status.is_flip_pending = flip_pending;
|
||||
|
||||
if (!flip_pending)
|
||||
plane_state->status.current_address = plane_state->status.requested_address;
|
||||
|
||||
if (plane_state->status.current_address.type == PLN_ADDR_TYPE_GRPH_STEREO &&
|
||||
tg->funcs->is_stereo_left_eye) {
|
||||
plane_state->status.is_right_eye =
|
||||
!tg->funcs->is_stereo_left_eye(pipe_ctx->stream_res.tg);
|
||||
|
|
|
@ -46,7 +46,6 @@ struct hubp {
|
|||
const struct hubp_funcs *funcs;
|
||||
struct dc_context *ctx;
|
||||
struct dc_plane_address request_address;
|
||||
struct dc_plane_address current_address;
|
||||
int inst;
|
||||
|
||||
/* run time states */
|
||||
|
|
Loading…
Reference in a new issue