Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2815423pxb; Mon, 18 Oct 2021 02:25:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNMdsXdBPPxGtmIewHe3HyUcx2ndelxYY60JRcNIE8XFKl4PfhrqvOBni2oogR/o7nDJN0 X-Received: by 2002:aa7:c783:: with SMTP id n3mr42732594eds.122.1634549152244; Mon, 18 Oct 2021 02:25:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634549152; cv=none; d=google.com; s=arc-20160816; b=OIfjjVJDgO2ZLYlhFya7x4h1L9hmz7gSO6ouFZ8lQ2oVcQ3x+t5j+fI7IceTYtR93j 8RtOx0KY1NfgiiUvHqCfJKrrDBAefa3mv0//tnXooTg+eOKm5ZxAvHu4O9qohnW6BcQy G8LlBaA7paVy+oqZ+jjJZhFO0i9SyWY8GzDuX09edPl2/9c6T8wfwJhK7afLNJtvKP7q ZUGGGF2b/8q1HqJgiTk643/XcjrjyXAi7lNvtQrVg1Jqk0M40FlgHDhIhCWQv4XY3jNY v7jHmbrS1KLVB0UcUqH+j+8WASlwx3aV9Vd8c6sRnm/0iPoGpjn9VZZqafAtYq27gwQi Eq4w== 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:to:from; bh=GhTIYj5wk8UGofBy89MPhzeQzPMjqIG7F4xYCKNcRg8=; b=KVo4GNrIitWxQ8iwgBzLdwalyLjJyZvtI83kHQKTkDuw48jMuQo/bG2vt9F7mAmPqN LqCc7LWDJaAc50Ch9ehJnI+erU6JHdaGH8SlrNkfZ+sEYNZWadeU43u3gEUDylCIlUgn i07fPOueouP/A/ke9gAL0Ge2qepVn0FGWD4xx/lOJgQMDMeVmz3yfThb8m7q0bjKcNSY X0CMltqV2XRBFQK6uDIYkqG6Tyt43c3iDJpQpCpXIgIM7iodtNV4adA5d0OAvMvR7Hyf xQUOUpnS7EYv1Ab070cL19YNhqJqj7B4O4IzYaLeV/3LCPFfPPBNY1ZxmH63adpS+QjY X8ng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hs24si30319692ejc.59.2021.10.18.02.25.29; Mon, 18 Oct 2021 02:25:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231635AbhJRJZS (ORCPT + 99 others); Mon, 18 Oct 2021 05:25:18 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:40141 "EHLO twspam01.aspeedtech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231495AbhJRJYz (ORCPT ); Mon, 18 Oct 2021 05:24:55 -0400 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 19I90Ga3071202; Mon, 18 Oct 2021 17:00:17 +0800 (GMT-8) (envelope-from jammy_huang@aspeedtech.com) Received: from JammyHuang-PC.aspeed.com (192.168.2.115) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 18 Oct 2021 17:22:11 +0800 From: Jammy Huang To: , , , , , , , , Subject: [PATCH v2 6/7] media: aspeed: add comments and macro Date: Mon, 18 Oct 2021 17:22:06 +0800 Message-ID: <20211018092207.13336-7-jammy_huang@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211018092207.13336-1-jammy_huang@aspeedtech.com> References: <20211018092207.13336-1-jammy_huang@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [192.168.2.115] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 19I90Ga3071202 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 a4fc31c93bde..070654a8419b 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -38,6 +38,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 DEVICE_NAME "aspeed-video" #define ASPEED_VIDEO_JPEG_NUM_QUALITIES 12 @@ -202,6 +204,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, @@ -234,6 +245,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; @@ -1244,7 +1277,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; @@ -1261,7 +1294,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 / @@ -1864,7 +1897,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