From: Aniket Masule <amasule@codeaurora.org>
To: linux-media@vger.kernel.org, stanimir.varbanov@linaro.org
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
vgarodia@codeaurora.org, Aniket Masule <amasule@codeaurora.org>
Subject: [PATCH 1/5] media: venus: Add codec data table
Date: Thu, 30 May 2019 19:28:24 +0530 [thread overview]
Message-ID: <1559224708-6039-2-git-send-email-amasule@codeaurora.org> (raw)
In-Reply-To: <1559224708-6039-1-git-send-email-amasule@codeaurora.org>
Add vpp cycles for for different types of codec
It indicates the cycles required by video hardware
to process each macroblock.
Signed-off-by: Aniket Masule <amasule@codeaurora.org>
---
drivers/media/platform/qcom/venus/core.c | 13 +++++++++++++
drivers/media/platform/qcom/venus/core.h | 15 +++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 7393667..e7ebea1 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -473,9 +473,22 @@ static __maybe_unused int venus_runtime_resume(struct device *dev)
{ 244800, 100000000 }, /* 1920x1080@30 */
};
+static struct codec_data sdm845_codec_data[] = {
+ { V4L2_PIX_FMT_H264, VIDC_SESSION_TYPE_ENC, 125 },
+ { V4L2_PIX_FMT_HEVC, VIDC_SESSION_TYPE_ENC, 125 },
+ { V4L2_PIX_FMT_VP8, VIDC_SESSION_TYPE_ENC, 125 },
+ { V4L2_PIX_FMT_MPEG2, VIDC_SESSION_TYPE_DEC, 50 },
+ { V4L2_PIX_FMT_H264, VIDC_SESSION_TYPE_DEC, 50 },
+ { V4L2_PIX_FMT_HEVC, VIDC_SESSION_TYPE_DEC, 50 },
+ { V4L2_PIX_FMT_VP8, VIDC_SESSION_TYPE_DEC, 50 },
+ { V4L2_PIX_FMT_VP9, VIDC_SESSION_TYPE_DEC, 50 },
+};
+
static const struct venus_resources sdm845_res = {
.freq_tbl = sdm845_freq_table,
.freq_tbl_size = ARRAY_SIZE(sdm845_freq_table),
+ .codec_data = sdm845_codec_data,
+ .codec_data_size = ARRAY_SIZE(sdm845_codec_data),
.clks = {"core", "iface", "bus" },
.clks_num = 3,
.max_load = 2563200,
diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 7a3feb5..b1a9b43 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -35,12 +35,20 @@ struct reg_val {
u32 value;
};
+struct codec_data {
+u32 pixfmt;
+u32 session_type;
+int vpp_cycles;
+};
+
struct venus_resources {
u64 dma_mask;
const struct freq_tbl *freq_tbl;
unsigned int freq_tbl_size;
const struct reg_val *reg_tbl;
unsigned int reg_tbl_size;
+ const struct codec_data *codec_data;
+ unsigned int codec_data_size;
const char * const clks[VIDC_CLKS_NUM_MAX];
unsigned int clks_num;
enum hfi_version hfi_version;
@@ -216,6 +224,12 @@ struct venus_buffer {
struct list_head ref_list;
};
+struct clock_data {
+ u32 core_id;
+ unsigned long freq;
+ struct codec_data *codec_data;
+};
+
#define to_venus_buffer(ptr) container_of(ptr, struct venus_buffer, vb)
/**
@@ -275,6 +289,7 @@ struct venus_inst {
struct list_head list;
struct mutex lock;
struct venus_core *core;
+ struct clock_data clk_data;
struct list_head dpbbufs;
struct list_head internalbufs;
struct list_head registeredbufs;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2019-05-30 13:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-30 13:58 [PATCH 0/5] media: venus: Update clock scaling and core selection Aniket Masule
2019-05-30 13:58 ` Aniket Masule [this message]
2019-05-30 13:58 ` [PATCH 2/5] media: venus: Initialize codec data Aniket Masule
2019-05-30 13:58 ` [PATCH 3/5] media: venus: Update clock scaling Aniket Masule
2019-05-30 13:58 ` [PATCH 4/5] media: venus: Add interface for load per core Aniket Masule
2019-05-30 13:58 ` [PATCH 5/5] media: venus: Update core selection Aniket Masule
2019-06-11 6:05 [PATCH v2 0/5] media: venus: Update clock scaling and " Aniket Masule
2019-06-11 6:05 ` [PATCH 1/5] media: venus: Add codec data table Aniket Masule
2019-06-17 8:37 ` Stanimir Varbanov
2019-06-20 8:11 ` amasule
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=1559224708-6039-2-git-send-email-amasule@codeaurora.org \
--to=amasule@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=stanimir.varbanov@linaro.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).