lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 297/800] media: venus: hfi_cmds: Fix conceal color property
    Date
    From: Stanimir Varbanov <stanimir.varbanov@linaro.org>

    [ Upstream commit 6e2202ca1ee034920b029124151754aec67b61ba ]

    The conceal color property used for Venus v4 and v6 has the same
    payload structure. But currently v4 follow down to payload
    structure for v1. Correct this by moving set_property to v4.

    Fixes: 4ef6039fad8f ("media: venus: vdec: Add support for conceal control")
    Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/qcom/venus/hfi_cmds.c | 22 ++++++++++----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
    index 11a8347e5f5c..4b9dea7f6940 100644
    --- a/drivers/media/platform/qcom/venus/hfi_cmds.c
    +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c
    @@ -1226,6 +1226,17 @@ pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt,
    pkt->shdr.hdr.size += sizeof(u32) + sizeof(*hdr10);
    break;
    }
    + case HFI_PROPERTY_PARAM_VDEC_CONCEAL_COLOR: {
    + struct hfi_conceal_color_v4 *color = prop_data;
    + u32 *in = pdata;
    +
    + color->conceal_color_8bit = *in & 0xff;
    + color->conceal_color_8bit |= ((*in >> 10) & 0xff) << 8;
    + color->conceal_color_8bit |= ((*in >> 20) & 0xff) << 16;
    + color->conceal_color_10bit = *in;
    + pkt->shdr.hdr.size += sizeof(u32) + sizeof(*color);
    + break;
    + }

    case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE:
    case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER:
    @@ -1279,17 +1290,6 @@ pkt_session_set_property_6xx(struct hfi_session_set_property_pkt *pkt,
    pkt->shdr.hdr.size += sizeof(u32) + sizeof(*cq);
    break;
    }
    - case HFI_PROPERTY_PARAM_VDEC_CONCEAL_COLOR: {
    - struct hfi_conceal_color_v4 *color = prop_data;
    - u32 *in = pdata;
    -
    - color->conceal_color_8bit = *in & 0xff;
    - color->conceal_color_8bit |= ((*in >> 10) & 0xff) << 8;
    - color->conceal_color_8bit |= ((*in >> 20) & 0xff) << 16;
    - color->conceal_color_10bit = *in;
    - pkt->shdr.hdr.size += sizeof(u32) + sizeof(*color);
    - break;
    - }
    default:
    return pkt_session_set_property_4xx(pkt, cookie, ptype, pdata);
    }
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:41    [W:4.360 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site