From: Jammy Huang <jammy_huang@aspeedtech.com>
To: <eajames@linux.ibm.com>, <mchehab@kernel.org>, <joel@jms.id.au>,
<andrew@aj.id.au>, <linux-media@vger.kernel.org>,
<openbmc@lists.ozlabs.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-aspeed@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 5/6] media: aspeed: add comments and macro
Date: Thu, 14 Oct 2021 11:48:18 +0800 [thread overview]
Message-ID: <20211014034819.2283-6-jammy_huang@aspeedtech.com> (raw)
In-Reply-To: <20211014034819.2283-1-jammy_huang@aspeedtech.com>
Add comments to describe video-stat and 'struct aspeed_video'.
Add macro, ASPEED_VIDEO_V4L2_MIN_BUF_REQ, to describe the buffers
needed.
Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
---
drivers/media/platform/aspeed-video.c | 39 ++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index 6b887fcaab7c..e1031fd09ac6 100644
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -37,6 +37,8 @@
#define V4L2_CID_ASPEED_HQ_MODE (ASPEED_CID_CUSTOM_BASE + 3)
#define V4L2_CID_ASPEED_HQ_JPEG_QUALITY (ASPEED_CID_CUSTOM_BASE + 4)
+#define ASPEED_VIDEO_V4L2_MIN_BUF_REQ 3
+
#define LOG_REG BIT(4)
#define LOG_DEBUG BIT(3)
#define LOG_TRACE BIT(2)
@@ -213,6 +215,15 @@
#define VE_MEM_RESTRICT_START 0x310
#define VE_MEM_RESTRICT_END 0x314
+/*
+ * @VIDEO_MODE_DETECT_DONE: a flag raised if signal lock
+ * @VIDEO_RES_CHANGE: a flag raised if res_change work on-going
+ * @VIDEO_RES_DETECT: a flag raised if res. detection on-going
+ * @VIDEO_STREAMING: a flag raised if user requires stream-on
+ * @VIDEO_FRAME_INPRG: a flag raised if hw working on a frame
+ * @VIDEO_STOPPED: a flag raised if device release
+ * @VIDEO_CLOCKS_ON: a flag raised if clk is on
+ */
enum {
VIDEO_MODE_DETECT_DONE,
VIDEO_RES_CHANGE,
@@ -245,6 +256,28 @@ struct aspeed_video_perf {
#define to_aspeed_video_buffer(x) \
container_of((x), struct aspeed_video_buffer, vb)
+/**
+ * struct aspeed_video - driver data
+ *
+ * @flags: holds the state of video
+ * @sequence: holds the last number of frame completed
+ * @max_compressed_size:holds max compressed stream's size
+ * @srcs: holds the buffer information for srcs
+ * @jpeg: holds the buffer information for jpeg header
+ * @bcd: holds the buffer information for bcd work
+ * @yuv420: a flag raised if JPEG subsampling is 420
+ * @partial_jpeg: a flag raised if JPEG supports partial capture
+ * @hq_mode: a flag raised if HQ is enabled. Only for partial_jpeg
+ * @frame_rate: holds the frame_rate
+ * @jpeg_quality: holds jpeq's quality (0~11)
+ * @jpeg_hq_quality: holds hq's quality (0~11) only if hq_mode enabled
+ * @compression_mode: holds jpeg compression mode
+ * @frame_bottom: end position of video data in vertical direction
+ * @frame_left: start position of video data in horizontal direction
+ * @frame_right: end position of video data in horizontal direction
+ * @frame_top: start position of video data in vertical direction
+ * @perf: holds the statistics primary for debugfs
+ */
struct aspeed_video {
void __iomem *base;
struct clk *eclk;
@@ -1250,7 +1283,7 @@ static int aspeed_video_get_parm(struct file *file, void *fh,
struct aspeed_video *video = video_drvdata(file);
a->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
- a->parm.capture.readbuffers = 3;
+ a->parm.capture.readbuffers = ASPEED_VIDEO_V4L2_MIN_BUF_REQ;
a->parm.capture.timeperframe.numerator = 1;
if (!video->frame_rate)
a->parm.capture.timeperframe.denominator = MAX_FRAME_RATE;
@@ -1267,7 +1300,7 @@ static int aspeed_video_set_parm(struct file *file, void *fh,
struct aspeed_video *video = video_drvdata(file);
a->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
- a->parm.capture.readbuffers = 3;
+ a->parm.capture.readbuffers = ASPEED_VIDEO_V4L2_MIN_BUF_REQ;
if (a->parm.capture.timeperframe.numerator)
frame_rate = a->parm.capture.timeperframe.denominator /
@@ -1876,7 +1909,7 @@ static int aspeed_video_setup_video(struct aspeed_video *video)
vbq->drv_priv = video;
vbq->buf_struct_size = sizeof(struct aspeed_video_buffer);
vbq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
- vbq->min_buffers_needed = 3;
+ vbq->min_buffers_needed = ASPEED_VIDEO_V4L2_MIN_BUF_REQ;
rc = vb2_queue_init(vbq);
if (rc) {
--
2.25.1
next prev parent reply other threads:[~2021-10-14 3:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-14 3:48 [PATCH 0/6] add aspeed-jpeg support for aspeed-video Jammy Huang
2021-10-14 3:48 ` [PATCH 1/6] media: aspeed: move err-handling together to the bottom Jammy Huang
2021-10-14 3:48 ` [PATCH 2/6] media: aspeed: add dprintk for more detailed log control Jammy Huang
2021-10-14 6:28 ` Paul Menzel
2021-10-15 2:16 ` Jammy Huang
2021-10-15 8:29 ` Paul Menzel
2021-10-14 3:48 ` [PATCH 3/6] media: aspeed: refine to centerize format/compress settings Jammy Huang
2021-10-14 6:36 ` Paul Menzel
2021-10-15 5:39 ` Jammy Huang
2021-10-14 3:48 ` [PATCH 4/6] media: aspeed: Support aspeed mode to reduce compressed data Jammy Huang
2021-10-14 6:47 ` Paul Menzel
2021-10-18 8:51 ` Jammy Huang
2021-10-18 9:34 ` Paul Menzel
2021-10-18 10:10 ` Jammy Huang
2021-10-14 3:48 ` Jammy Huang [this message]
2021-10-14 3:48 ` [PATCH 6/6] media: aspeed: richer debugfs Jammy Huang
2021-10-14 6:54 ` Paul Menzel
2021-10-14 6:57 ` Paul Menzel
2021-10-15 3:29 ` Jammy Huang
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=20211014034819.2283-6-jammy_huang@aspeedtech.com \
--to=jammy_huang@aspeedtech.com \
--cc=andrew@aj.id.au \
--cc=eajames@linux.ibm.com \
--cc=joel@jms.id.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=openbmc@lists.ozlabs.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).