From patchwork Tue Feb 9 09:45:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 379299 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp65879jah; Tue, 9 Feb 2021 01:48:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxfKaNBCv7/JKirF5NkO8nvag1BWq+IrcCsyyJM3Lyy+gSo8kGDSz763vy2h7FILHxdHR1 X-Received: by 2002:a50:fa93:: with SMTP id w19mr20326618edr.211.1612864131578; Tue, 09 Feb 2021 01:48:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612864131; cv=none; d=google.com; s=arc-20160816; b=QUjbfCt+UHWbm5vAztjMcFBbbCiGEOgeyNX0zwqaFloj9tolSfvQf0MzrjwYN3q4zj AyQr9CX73sV2D7qAKpCD4bZ1JkWOv72nMDSfp9A23BLjLziYI+vwJGrmvCgZrMOsL9Ls GqaPOAcR9qym2ZwBuiPMYoDKPC79cMt2ywjt3GXM28bMpuFxUnkbHe9aUSUY/suxxxyI yQ6tMNkn+FcvXlVD3QOugxXN/qbo6qzpiBPREom/80oLCfmwvJAVn7uC9/bnzXIunxMm By+4pLb4WdKd0y7hs9w4KA85H03fzWhYACjHeilkINM2Ng6YzTP1IqNMfOb0FWDGQ2z/ y4Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fSiros/bpA33DrxLIopBprg2PSwxl41ia1ZrqmhCZho=; b=tqtVMBlT3E7UDPww/fuBPy2+0MKp1ClXiwxD/SnwWH2grmUBarSIZJL1JRR1OqFSE6 fXkjILg7UfAfbtgQQqaDT0k/wVWKs7ANWK+WD5gjvnu+Wm+v0XufS1hRFVtZfeteYwSO G80ohR3FGSk30MTNPg+O8zQTEJLCaoGSUfGl7TBOcdrIHXyO9ew86Kd2QHr9PY65DScX SMkMNNOb8iDQxvGoP8pf/ORKGaywTck3l0I6GYk9XKKgPTB7yEfA6Z22T8oG670SBlZQ oEwUU8f7kkhkULS+/jvEoA/p583lhJz/MzJyBaP0u7STRr4rk9qP55t+/HZt+stMUk/9 auMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vuymAfDy; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hq38si12262318ejc.21.2021.02.09.01.48.51; Tue, 09 Feb 2021 01:48:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vuymAfDy; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230283AbhBIJss (ORCPT + 16 others); Tue, 9 Feb 2021 04:48:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230229AbhBIJqq (ORCPT ); Tue, 9 Feb 2021 04:46:46 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23F53C0617AA for ; Tue, 9 Feb 2021 01:46:30 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id h12so4535790wrw.6 for ; Tue, 09 Feb 2021 01:46:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fSiros/bpA33DrxLIopBprg2PSwxl41ia1ZrqmhCZho=; b=vuymAfDyb9XWQJGjC4tFRu9OpDkqZ6wpjb+3cg+oJtEvl6F3yIguUVh2zjmPp0e/vk +glgf+5EvIHURqr9BnMpmoPB3fyPZQFNXrox+OkaUC/8lHwp8GbR+37c/V04gVQS0AvI 5YYUbIf2uAq+uXt1vWaOU9wMWhxFNFF+YRfmDhqcPILso0AfKV3pRkZBSElXEhHe155H jBL15Mghp1LSsKAjzZbHsuHGTjGGgCuWq+S7cWKzaAG8eB9l6fX9bOioNgVUCM4owsG5 3wskIW5DkZ78EPcPvchpZecKfdvbcu/u5vf/0DMGA/faJOnaoe8krNwjgKAZNPyKt7O+ YrkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fSiros/bpA33DrxLIopBprg2PSwxl41ia1ZrqmhCZho=; b=Fz2l3BA2v5G6A2gGZHqLwlwS39ELth8/+EsExnLID8eP5CPWSbUu25d3UqPsxFvc3J lHUbYNJDWBZATu9nWVGV9v7etssAgcnBxHsPg64OJX7MZsaCmujsNBYBvYl2tQJYfQ6r zGhmhlswpEqNGUjm0c57yxPa7NMgJTgoecWP587vg7qP0/+qpQVej6sa/gUG47yGcHsG qKkylzBhOf0odY5c/qh5zq262BZ/+WAEGPP3CRyI2mRn9UPitbKuHaxPG9mGXPk4mIuA puf1rgyxCyrDf7dJYYb/TmrL1FgCCJctTBXxJ2l9ntik/p6Q1KPgyf2vH+FKYQG2B1Uw dMsQ== X-Gm-Message-State: AOAM532UlG283AvEM0Gx/1BwlC64fIiyy3hNpy2xdybDxsJ10GkMpKij mHGGFkYbcMs6BaXe2l0/mg9XtOoL8hHnYBdm X-Received: by 2002:adf:f749:: with SMTP id z9mr23848375wrp.327.1612863983827; Tue, 09 Feb 2021 01:46:23 -0800 (PST) Received: from localhost.localdomain (hst-221-63.medicom.bg. [84.238.221.63]) by smtp.gmail.com with ESMTPSA id u14sm1509627wro.10.2021.02.09.01.46.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 01:46:23 -0800 (PST) From: Stanimir Varbanov To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Hans Verkuil , Stanimir Varbanov Subject: [PATCH 2/2] venus: vdec: Add support for conceal control Date: Tue, 9 Feb 2021 11:45:27 +0200 Message-Id: <20210209094527.2173690-3-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210209094527.2173690-1-stanimir.varbanov@linaro.org> References: <20210209094527.2173690-1-stanimir.varbanov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Adds support for decoder conceal color control. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/hfi_cmds.c | 18 ++++++++++++++++-- drivers/media/platform/qcom/venus/hfi_helper.h | 10 ++++++++++ drivers/media/platform/qcom/venus/vdec.c | 11 ++++++++++- drivers/media/platform/qcom/venus/vdec_ctrls.c | 7 +++++++ 5 files changed, 44 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index a252ed32cc14..b70ff14e5a5b 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -172,6 +172,7 @@ struct vdec_controls { u32 post_loop_deb_mode; u32 profile; u32 level; + u64 conceal_color; }; struct venc_controls { diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c index 4f7565834469..884339aae6a7 100644 --- a/drivers/media/platform/qcom/venus/hfi_cmds.c +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c @@ -760,7 +760,9 @@ static int pkt_session_set_property_1x(struct hfi_session_set_property_pkt *pkt, struct hfi_conceal_color *color = prop_data; u32 *in = pdata; - color->conceal_color = *in; + color->conceal_color = *in & 0xff; + color->conceal_color |= ((*in >> 10) & 0xff) << 8; + color->conceal_color |= ((*in >> 20) & 0xff) << 16; pkt->shdr.hdr.size += sizeof(u32) + sizeof(*color); break; } @@ -1255,7 +1257,19 @@ pkt_session_set_property_6xx(struct hfi_session_set_property_pkt *pkt, cq->frame_quality = in->frame_quality; pkt->shdr.hdr.size += sizeof(u32) + sizeof(*cq); break; - } default: + } + 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); } diff --git a/drivers/media/platform/qcom/venus/hfi_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h index 6b524c7cde5f..fa49b49170b7 100644 --- a/drivers/media/platform/qcom/venus/hfi_helper.h +++ b/drivers/media/platform/qcom/venus/hfi_helper.h @@ -685,10 +685,20 @@ struct hfi_vc1e_perf_cfg_type { u32 search_range_y_subsampled[3]; }; +/* + * 0 - 7bit -> Luma (def: 16) + * 8 - 15bit -> Chroma (def: 128) + * format is valid up to v4 + */ struct hfi_conceal_color { u32 conceal_color; }; +struct hfi_conceal_color_v4 { + u32 conceal_color_8bit; + u32 conceal_color_10bit; +}; + struct hfi_intra_period { u32 pframes; u32 bframes; diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index e4dc97f00fc3..8d98fca55db1 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -620,7 +620,7 @@ static int vdec_set_properties(struct venus_inst *inst) { struct vdec_controls *ctr = &inst->controls.dec; struct hfi_enable en = { .enable = 1 }; - u32 ptype; + u32 ptype, conceal; int ret; if (ctr->post_loop_deb_mode) { @@ -630,6 +630,15 @@ static int vdec_set_properties(struct venus_inst *inst) return ret; } + ptype = HFI_PROPERTY_PARAM_VDEC_CONCEAL_COLOR; + conceal = ctr->conceal_color & 0xffff; + conceal |= ((ctr->conceal_color >> 16) & 0xffff) << 10; + conceal |= ((ctr->conceal_color >> 32) & 0xffff) << 20; + + ret = hfi_session_set_property(inst, ptype, &conceal); + if (ret) + return ret; + return 0; } diff --git a/drivers/media/platform/qcom/venus/vdec_ctrls.c b/drivers/media/platform/qcom/venus/vdec_ctrls.c index 974110b75b93..9ff3db1c4a0f 100644 --- a/drivers/media/platform/qcom/venus/vdec_ctrls.c +++ b/drivers/media/platform/qcom/venus/vdec_ctrls.c @@ -30,6 +30,9 @@ static int vdec_op_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_MPEG_VIDEO_VP9_LEVEL: ctr->level = ctrl->val; break; + case V4L2_CID_MPEG_VIDEO_DEC_CONCEAL_COLOR: + ctr->conceal_color = *ctrl->p_new.p_s64; + break; default: return -EINVAL; } @@ -158,6 +161,10 @@ int vdec_ctrl_init(struct venus_inst *inst) if (ctrl) ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; + v4l2_ctrl_new_std(&inst->ctrl_handler, &vdec_ctrl_ops, + V4L2_CID_MPEG_VIDEO_DEC_CONCEAL_COLOR, 0, + 0xffffffffffffLL, 1, 0x8000800010LL); + ret = inst->ctrl_handler.error; if (ret) { v4l2_ctrl_handler_free(&inst->ctrl_handler);