From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
Vikash Garodia <vgarodia@codeaurora.org>,
Tomasz Figa <tfiga@chromium.org>,
Alexandre Courbot <acourbot@chromium.org>,
Stanimir Varbanov <stanimir.varbanov@linaro.org>
Subject: [PATCH v5 04/27] venus: hfi_cmds: add set_properties for 4xx version
Date: Thu, 5 Jul 2018 16:03:38 +0300 [thread overview]
Message-ID: <20180705130401.24315-5-stanimir.varbanov@linaro.org> (raw)
In-Reply-To: <20180705130401.24315-1-stanimir.varbanov@linaro.org>
Adds set_properties method to handle newer 4xx properties and
fall-back to 3xx for the rest.
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
drivers/media/platform/qcom/venus/hfi_cmds.c | 62 +++++++++++++++++++++++++++-
1 file changed, 61 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
index 1cfeb7743041..e8389d8d8c48 100644
--- a/drivers/media/platform/qcom/venus/hfi_cmds.c
+++ b/drivers/media/platform/qcom/venus/hfi_cmds.c
@@ -1166,6 +1166,63 @@ pkt_session_set_property_3xx(struct hfi_session_set_property_pkt *pkt,
return ret;
}
+static int
+pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt,
+ void *cookie, u32 ptype, void *pdata)
+{
+ void *prop_data;
+
+ if (!pkt || !cookie || !pdata)
+ return -EINVAL;
+
+ prop_data = &pkt->data[1];
+
+ pkt->shdr.hdr.size = sizeof(*pkt);
+ pkt->shdr.hdr.pkt_type = HFI_CMD_SESSION_SET_PROPERTY;
+ pkt->shdr.session_id = hash32_ptr(cookie);
+ pkt->num_properties = 1;
+ pkt->data[0] = ptype;
+
+ /*
+ * Any session set property which is different in 3XX packetization
+ * should be added as a new case below. All unchanged session set
+ * properties will be handled in the default case.
+ */
+ switch (ptype) {
+ case HFI_PROPERTY_PARAM_BUFFER_COUNT_ACTUAL: {
+ struct hfi_buffer_count_actual *in = pdata;
+ struct hfi_buffer_count_actual_4xx *count = prop_data;
+
+ count->count_actual = in->count_actual;
+ count->type = in->type;
+ count->count_min_host = in->count_actual;
+ pkt->shdr.hdr.size += sizeof(u32) + sizeof(*count);
+ break;
+ }
+ case HFI_PROPERTY_PARAM_WORK_MODE: {
+ struct hfi_video_work_mode *in = pdata, *wm = prop_data;
+
+ wm->video_work_mode = in->video_work_mode;
+ pkt->shdr.hdr.size += sizeof(u32) + sizeof(*wm);
+ break;
+ }
+ case HFI_PROPERTY_CONFIG_VIDEOCORES_USAGE: {
+ struct hfi_videocores_usage_type *in = pdata, *cu = prop_data;
+
+ cu->video_core_enable_mask = in->video_core_enable_mask;
+ pkt->shdr.hdr.size += sizeof(u32) + sizeof(*cu);
+ break;
+ }
+ case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE:
+ /* not implemented on Venus 4xx */
+ break;
+ default:
+ return pkt_session_set_property_3xx(pkt, cookie, ptype, pdata);
+ }
+
+ return 0;
+}
+
int pkt_session_get_property(struct hfi_session_get_property_pkt *pkt,
void *cookie, u32 ptype)
{
@@ -1181,7 +1238,10 @@ int pkt_session_set_property(struct hfi_session_set_property_pkt *pkt,
if (hfi_ver == HFI_VERSION_1XX)
return pkt_session_set_property_1x(pkt, cookie, ptype, pdata);
- return pkt_session_set_property_3xx(pkt, cookie, ptype, pdata);
+ if (hfi_ver == HFI_VERSION_3XX)
+ return pkt_session_set_property_3xx(pkt, cookie, ptype, pdata);
+
+ return pkt_session_set_property_4xx(pkt, cookie, ptype, pdata);
}
void pkt_set_version(enum hfi_version version)
--
2.14.1
next prev parent reply other threads:[~2018-07-05 13:14 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 13:03 [PATCH v5 00/27] Venus updates Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 01/27] venus: hfi_msgs: correct pointer increment Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 02/27] venus: hfi: preparation to support venus 4xx Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 03/27] venus: hfi: update sequence event to handle more properties Stanimir Varbanov
2018-07-05 13:03 ` Stanimir Varbanov [this message]
2018-07-05 13:03 ` [PATCH v5 05/27] venus: hfi: support session continue for 4xx version Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 06/27] venus: hfi: handle buffer output2 type as well Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 07/27] venus: hfi_venus: add halt AXI support for Venus 4xx Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 08/27] venus: hfi_venus: fix suspend function for venus 3xx versions Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 09/27] venus: hfi_venus: move set of default properties to core init Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 10/27] venus: hfi_venus: add suspend functionality for Venus 4xx Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 11/27] venus: core,helpers: add two more clocks found in " Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 12/27] venus: hfi_parser: add common capability parser Stanimir Varbanov
2018-07-06 11:21 ` Hans Verkuil
2018-07-06 12:19 ` Stanimir Varbanov
2018-07-06 12:27 ` Hans Verkuil
2018-07-06 12:47 ` [PATCH v6 " Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 13/27] venus: helpers: rename a helper function and use buffer mode from caps Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 14/27] venus: helpers: add a helper function to set dynamic buffer mode Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 15/27] venus: helpers: add helper function to set actual buffer size Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 16/27] venus: core: delete not used buffer mode flags Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 17/27] venus: helpers: add buffer type argument to a helper Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 18/27] venus: helpers: add a new helper to set raw format Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 19/27] venus: helpers,vdec,venc: add helpers to set work mode and core usage Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 20/27] venus: helpers: extend set_num_bufs helper with one more argument Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 21/27] venus: helpers: add a helper to return opb buffer sizes Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 22/27] venus: vdec: get required input buffers as well Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 23/27] venus: vdec: a new function for output configuration Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 24/27] venus: helpers: move frame size calculations on common place Stanimir Varbanov
2018-07-05 13:03 ` [PATCH v5 25/27] venus: implementing multi-stream support Stanimir Varbanov
2018-07-05 13:04 ` [PATCH v5 26/27] venus: core: add sdm845 DT compatible and resource data Stanimir Varbanov
2018-07-05 13:04 ` [PATCH v5 27/27] venus: add HEVC codec support Stanimir Varbanov
2018-07-05 14:07 ` [PATCH v5 00/27] Venus updates Tomasz Figa
2018-07-05 14:08 ` Hans Verkuil
2018-07-05 14:51 ` Stanimir Varbanov
2018-07-05 15:00 ` Alexandre Courbot
2018-07-06 3:55 ` Alexandre Courbot
2018-07-06 7:11 ` Stanimir Varbanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180705130401.24315-5-stanimir.varbanov@linaro.org \
--to=stanimir.varbanov@linaro.org \
--cc=acourbot@chromium.org \
--cc=hverkuil@xs4all.nl \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=tfiga@chromium.org \
--cc=vgarodia@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).