From 4b26e8c561541c68c5755660eaad355d9a9afc86 Mon Sep 17 00:00:00 2001 From: Konstantin Kozhevnikov Date: Wed, 11 Apr 2018 05:11:21 -0700 Subject: [PATCH] Add cropping handling to VSP alpha-planes --- drivers/media/platform/vsp1/vsp1_dl.c | 2 +- drivers/media/platform/vsp1/vsp1_rpf.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c index f9c6d09..d6314cd 100644 --- a/drivers/media/platform/vsp1/vsp1_dl.c +++ b/drivers/media/platform/vsp1/vsp1_dl.c @@ -363,7 +363,7 @@ void vsp1_dl_set_addr_auto_fld(struct vsp1_dl_list *dl, struct vsp1_rwpf *rpf) dl->src_dst_addr[v_bot_index].addr = v_bot_addr; /* ...set alpha-plane address as needed */ - dl->src_dst_addr[alpha_index].addr = rpf->mem.alpha; + dl->src_dst_addr[alpha_index].addr = rpf->mem.alpha + crop->top * width + crop->left; } static struct vsp1_dl_list *vsp1_dl_list_alloc(struct vsp1_dl_manager *dlm) diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c index 2cce294..1f70186 100644 --- a/drivers/media/platform/vsp1/vsp1_rpf.c +++ b/drivers/media/platform/vsp1/vsp1_rpf.c @@ -292,10 +292,11 @@ static void rpf_configure(struct vsp1_entity *entity, // ...setup alpha-plane as required if (rpf->mem.alpha) { - vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_AI, rpf->mem.alpha); + struct v4l2_rect *crop = vsp1_rwpf_get_crop(rpf, rpf->entity.config); + vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_AI, rpf->mem.alpha + crop->top * rpf->alpha_pitch + crop->left); vsp1_rpf_write(rpf, dl, VI6_RPF_ALPH_SEL, VI6_RPF_ALPH_SEL_ASEL_8B_PLANE); vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ASTRIDE, rpf->alpha_pitch); - dev_dbg(vsp1->dev, "rpf#%d: setup alpha-plane: buffer=%pad, stride=%u\n", rpf->entity.index, &rpf->mem.alpha, rpf->alpha_pitch); + dev_dbg(vsp1->dev, "rpf#%d: setup alpha-plane: buffer=%pad, crop=%d,%d, stride=%u\n", rpf->entity.index, &rpf->mem.alpha, crop->left, crop->top, rpf->alpha_pitch); goto out; } -- 2.7.4