Skip to contentSkip to conversation

media: aspeed: Add additional input type, GFX, to capture

PATCH In review Jammy Huang 3 participants 3 messages Jul 4, 2024 – Jul 5, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: aspeed: Add additional input type, GFX, to capture

ASPEED BMC IC has 2 different display engines.
1. VGA on PCIe
2. SoC Display(GFX)

By default, video engine(VE) will capture video from VGA. This patch adds an option to caputre video from GFX with standard ioctl, vidioc_s_input.

An enum, aspeed_video_input, is added for this purpose. enum aspeed_video_input {
VIDEO_INPUT_VGA = 0,
VIDEO_INPUT_GFX,
VIDEO_INPUT_MAX
};

---
 drivers/media/platform/aspeed/aspeed-video.c | 177 ++++++++++++++++---
 include/uapi/linux/aspeed-video.h            |   7 +
 2 files changed, 158 insertions(+), 26 deletions(-)
drivers/media/platform/aspeed/aspeed-video.c +151 -26
index fc6050e3be0d..da5bf512a8ab 100644
@@ -25,6 +25,8 @@
 #include <linux/workqueue.h>
 #include <linux/debugfs.h>
 #include <linux/ktime.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-device.h>
@@ -203,6 +205,25 @@
 #define VE_MEM_RESTRICT_START		0x310
 #define VE_MEM_RESTRICT_END		0x314
 
+// SCU's registers
+#define SCU_MISC_CTRL			0xC0
+#define  SCU_DPLL_SOURCE		BIT(20)
+
+// GFX's registers
+#define GFX_CTRL			0x60
+#define  GFX_CTRL_ENABLE		BIT(0)
+#define  GFX_CTRL_FMT			GENMASK(9, 7)
+
+#define GFX_H_DISPLAY			0x70
+#define  GFX_H_DISPLAY_DE		GENMASK(28, 16)
+#define  GFX_H_DISPLAY_TOTAL		GENMASK(12, 0)
+
+#define GFX_V_DISPLAY			0x78
+#define  GFX_V_DISPLAY_DE		GENMASK(27, 16)
+#define  GFX_V_DISPLAY_TOTAL		GENMASK(11, 0)
+
+#define GFX_DISPLAY_ADDR		0x80
+
 /*
  * VIDEO_MODE_DETECT_DONE:	a flag raised if signal lock
  * VIDEO_RES_CHANGE:		a flag raised if res_change work on-going
@@ -273,6 +294,7 @@ struct aspeed_video_perf {
  * yuv420:		a flag raised if JPEG subsampling is 420
  * format:		holds the video format
  * hq_mode:		a flag raised if HQ is enabled. Only for VIDEO_FMT_ASPEED
+ * input:		holds the video input
  * frame_rate:		holds the frame_rate
  * jpeg_quality:	holds jpeq's quality (0~11)
  * jpeg_hq_quality:	holds hq's quality (1~12) only if hq_mode enabled
@@ -298,6 +320,8 @@ struct aspeed_video {
 	struct video_device vdev;
 	struct mutex video_lock;	/* v4l2 and videobuf2 lock */
 
+	struct regmap *scu;
+	struct regmap *gfx;
 	u32 jpeg_mode;
 	u32 comp_size_read;
 
@@ -316,6 +340,7 @@ struct aspeed_video {
 	bool yuv420;
 	enum aspeed_video_format format;
 	bool hq_mode;
+	enum aspeed_video_input input;
 	unsigned int frame_rate;
 	unsigned int jpeg_quality;
 	unsigned int jpeg_hq_quality;
@@ -485,6 +510,7 @@ static const struct v4l2_dv_timings_cap aspeed_video_timings_cap = {
 
 static const char * const format_str[] = {"Standard JPEG",
 	"Aspeed JPEG"};
+static const char * const input_str[] = {"VGA", "BMC GFX"};
 
 static unsigned int debug;
 
@@ -609,6 +635,14 @@ static int aspeed_video_start_frame(struct aspeed_video *video)
 		aspeed_video_free_buf(video, &video->bcd);
 	}
 
+	if (video->input == VIDEO_INPUT_GFX) {
+		u32 val;
+
+		// update input buffer address as gfx's
+		regmap_read(video->gfx, GFX_DISPLAY_ADDR, &val);
+		aspeed_video_write(video, VE_TGS_0, val);
+	}
+
 	spin_lock_irqsave(&video->lock, flags);
 	buf = list_first_entry_or_null(&video->buffers,
 				       struct aspeed_video_buffer, link);
@@ -1026,9 +1060,23 @@ static void aspeed_video_get_timings(struct aspeed_video *v,
 	}
 }
 
+static void aspeed_video_get_resolution_gfx(struct aspeed_video *video,
+					    struct v4l2_bt_timings *det)
+{
+	u32 h_val, v_val;
+
+	regmap_read(video->gfx, GFX_H_DISPLAY, &h_val);
+	regmap_read(video->gfx, GFX_V_DISPLAY, &v_val);
+
+	det->width = FIELD_GET(GFX_H_DISPLAY_DE, h_val) + 1;
+	det->height = FIELD_GET(GFX_V_DISPLAY_DE, v_val) + 1;
+	video->v4l2_input_status = 0;
+}
+
 #define res_check(v) test_and_clear_bit(VIDEO_MODE_DETECT_DONE, &(v)->flags)
 
-static void aspeed_video_get_resolution(struct aspeed_video *video)
+static void aspeed_video_get_resolution_vga(struct aspeed_video *video,
+					    struct v4l2_bt_timings *det)
 {
 	bool invalid_resolution = true;
 	int rc;
@@ -1036,7 +1084,6 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
 	u32 mds;
 	u32 src_lr_edge;
 	u32 src_tb_edge;
-	struct v4l2_bt_timings *det = &video->detected_timings;
 
 	det->width = MIN_WIDTH;
 	det->height = MIN_HEIGHT;
@@ -1113,14 +1160,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
 
 	aspeed_video_get_timings(video, det);
 
-	/*
-	 * Enable mode-detect watchdog, resolution-change watchdog and
-	 * automatic compression after frame capture.
-	 */
+	/* Enable mode-detect watchdog, resolution-change watchdog */
 	aspeed_video_update(video, VE_INTERRUPT_CTRL, 0,
 			    VE_INTERRUPT_MODE_DETECT_WD);
-	aspeed_video_update(video, VE_SEQ_CTRL, 0,
-			    VE_SEQ_CTRL_AUTO_COMP | VE_SEQ_CTRL_EN_WATCHDOG);
+	aspeed_video_update(video, VE_SEQ_CTRL, 0, VE_SEQ_CTRL_EN_WATCHDOG);
+}
+
+static void aspeed_video_get_resolution(struct aspeed_video *video)
+{
+	struct v4l2_bt_timings *det = &video->detected_timings;
+
+	if (video->input == VIDEO_INPUT_GFX)
+		aspeed_video_get_resolution_gfx(video, det);
+	else
+		aspeed_video_get_resolution_vga(video, det);
 
 	v4l2_dbg(1, debug, &video->v4l2_dev, "Got resolution: %dx%d\n",
 		 det->width, det->height);
@@ -1156,7 +1209,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
 	aspeed_video_write(video, VE_SRC_SCANLINE_OFFSET, act->width * 4);
 
 	/* Don't use direct mode below 1024 x 768 (irqs don't fire) */
-	if (size < DIRECT_FETCH_THRESHOLD) {
+	if (video->input == VIDEO_INPUT_VGA && size < DIRECT_FETCH_THRESHOLD) {
 		v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Sync Mode\n");
 		aspeed_video_write(video, VE_TGS_0,
 				   FIELD_PREP(VE_TGS_FIRST,
@@ -1171,10 +1224,20 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
 				    VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH,
 				    VE_CTRL_INT_DE);
 	} else {
+		u32 ctrl, val, bpp;
+
 		v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Direct Mode\n");
+		ctrl = VE_CTRL_DIRECT_FETCH;
+		if (video->input == VIDEO_INPUT_GFX) {
+			regmap_read(video->gfx, GFX_CTRL, &val);
+			bpp = FIELD_GET(GFX_CTRL_FMT, val) ? 32 : 16;
+			if (bpp == 16)
+				ctrl |= VE_CTRL_INT_DE;
+			aspeed_video_write(video, VE_TGS_1, act->width * (bpp >> 3));
+		}
 		aspeed_video_update(video, VE_CTRL,
 				    VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH,
-				    VE_CTRL_DIRECT_FETCH);
+				    ctrl);
 	}
 
 	size *= 4;
@@ -1207,6 +1270,22 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
 		aspeed_video_free_buf(video, &video->srcs[0]);
 }
 
+/*
+ * Update relative parameters when timing changed.
+ *
+ * @video: the struct of aspeed_video
+ * @timings: the new timings
+ */
+static void aspeed_video_update_timings(struct aspeed_video *video, struct v4l2_bt_timings *timings)
+{
+	video->active_timings = *timings;
+	aspeed_video_set_resolution(video);
+
+	video->pix_fmt.width = timings->width;
+	video->pix_fmt.height = timings->height;
+	video->pix_fmt.sizeimage = video->max_compressed_size;
+}
+
 static void aspeed_video_update_regs(struct aspeed_video *video)
 {
 	u8 jpeg_hq_quality = clamp((int)video->jpeg_hq_quality - 1, 0,
@@ -1219,6 +1298,8 @@ static void aspeed_video_update_regs(struct aspeed_video *video)
 	u32 ctrl = 0;
 	u32 seq_ctrl = 0;
 
+	v4l2_dbg(1, debug, &video->v4l2_dev, "input(%s)\n",
+		 input_str[video->input]);
 	v4l2_dbg(1, debug, &video->v4l2_dev, "framerate(%d)\n",
 		 video->frame_rate);
 	v4l2_dbg(1, debug, &video->v4l2_dev, "jpeg format(%s) subsample(%s)\n",
@@ -1234,6 +1315,9 @@ static void aspeed_video_update_regs(struct aspeed_video *video)
 	else
 		aspeed_video_update(video, VE_BCD_CTRL, VE_BCD_CTRL_EN_BCD, 0);
 
+	if (video->input == VIDEO_INPUT_VGA)
+		ctrl |= VE_CTRL_AUTO_OR_CURSOR;
+
 	if (video->frame_rate)
 		ctrl |= FIELD_PREP(VE_CTRL_FRC, video->frame_rate);
 
@@ -1252,7 +1336,9 @@ static void aspeed_video_update_regs(struct aspeed_video *video)
 	aspeed_video_update(video, VE_SEQ_CTRL,
 			    video->jpeg_mode | VE_SEQ_CTRL_YUV420,
 			    seq_ctrl);
-	aspeed_video_update(video, VE_CTRL, VE_CTRL_FRC, ctrl);
+	aspeed_video_update(video, VE_CTRL,
+			    VE_CTRL_FRC | VE_CTRL_AUTO_OR_CURSOR |
+			    VE_CTRL_SOURCE, ctrl);
 	aspeed_video_update(video, VE_COMP_CTRL,
 			    VE_COMP_CTRL_DCT_LUM | VE_COMP_CTRL_DCT_CHR |
 			    VE_COMP_CTRL_EN_HQ | VE_COMP_CTRL_HQ_DCT_LUM |
@@ -1280,6 +1366,7 @@ static void aspeed_video_init_regs(struct aspeed_video *video)
 	aspeed_video_write(video, VE_JPEG_ADDR, video->jpeg.dma);
 
 	/* Set control registers */
+	aspeed_video_write(video, VE_SEQ_CTRL, VE_SEQ_CTRL_AUTO_COMP);
 	aspeed_video_write(video, VE_CTRL, ctrl);
 	aspeed_video_write(video, VE_COMP_CTRL, VE_COMP_CTRL_RSVD);
 
@@ -1311,12 +1398,7 @@ static void aspeed_video_start(struct aspeed_video *video)
 	aspeed_video_get_resolution(video);
 
 	/* Set timings since the device is being opened for the first time */
-	video->active_timings = video->detected_timings;
-	aspeed_video_set_resolution(video);
-
-	video->pix_fmt.width = video->active_timings.width;
-	video->pix_fmt.height = video->active_timings.height;
-	video->pix_fmt.sizeimage = video->max_compressed_size;
+	aspeed_video_update_timings(video, &video->detected_timings);
 }
 
 static void aspeed_video_stop(struct aspeed_video *video)
@@ -1414,15 +1496,44 @@ static int aspeed_video_enum_input(struct file *file, void *fh,
 
 static int aspeed_video_get_input(struct file *file, void *fh, unsigned int *i)
 {
-	*i = 0;
+	struct aspeed_video *video = video_drvdata(file);
+
+	*i = video->input;
 
 	return 0;
 }
 
 static int aspeed_video_set_input(struct file *file, void *fh, unsigned int i)
 {
-	if (i)
+	struct aspeed_video *video = video_drvdata(file);
+
+	if (i >= VIDEO_INPUT_MAX)
+		return -EINVAL;
+
+	if (IS_ERR(video->scu)) {
+		v4l2_dbg(1, debug, &video->v4l2_dev, "%s: scu isn't ready for input-control\n", __func__);
+		return -EINVAL;
+	}
+
+	if (IS_ERR(video->gfx) && i == VIDEO_INPUT_GFX) {
+		v4l2_dbg(1, debug, &video->v4l2_dev, "%s: gfx isn't ready for GFX input\n", __func__);
 		return -EINVAL;
+	}
+
+	video->input = i;
+
+	// modify dpll source per current input
+	if (video->input == VIDEO_INPUT_VGA)
+		regmap_update_bits(video->scu, SCU_MISC_CTRL, SCU_DPLL_SOURCE, 0);
+	else
+		regmap_update_bits(video->scu, SCU_MISC_CTRL, SCU_DPLL_SOURCE, SCU_DPLL_SOURCE);
+
+	aspeed_video_update_regs(video);
+
+	// update signal status
+	aspeed_video_get_resolution(video);
+	if (!video->v4l2_input_status)
+		aspeed_video_update_timings(video, &video->detected_timings);
 
 	return 0;
 }
@@ -1527,13 +1638,7 @@ static int aspeed_video_set_dv_timings(struct file *file, void *fh,
 	if (vb2_is_busy(&video->queue))
 		return -EBUSY;
 
-	video->active_timings = timings->bt;
-
-	aspeed_video_set_resolution(video);
-
-	video->pix_fmt.width = timings->bt.width;
-	video->pix_fmt.height = timings->bt.height;
-	video->pix_fmt.sizeimage = video->max_compressed_size;
+	aspeed_video_update_timings(video, &timings->bt);
 
 	timings->type = V4L2_DV_BT_656_1120;
 
@@ -1911,6 +2016,7 @@ static int aspeed_video_debugfs_show(struct seq_file *s, void *data)
 	val08 = aspeed_video_read(v, VE_CTRL);
 	if (FIELD_GET(VE_CTRL_DIRECT_FETCH, val08)) {
 		seq_printf(s, "  %-20s:\tDirect fetch\n", "Mode");
+		seq_printf(s, "  %-20s:\t%s\n", "Input", input_str[v->input]);
 		seq_printf(s, "  %-20s:\t%s\n", "VGA bpp mode",
 			   FIELD_GET(VE_CTRL_INT_DE, val08) ? "16" : "32");
 	} else {
@@ -2070,12 +2176,31 @@ static int aspeed_video_setup_video(struct aspeed_video *video)
 	return 0;
 }
 
+// Get regmap without checking res, such as clk/reset, that could lead to conflict.
+static struct regmap *aspeed_regmap_lookup(struct device_node *np, const char *property)
+{
+	struct device_node *syscon_np;
+	struct regmap *regmap;
+
+	syscon_np = of_parse_phandle(np, property, 0);
+	if (!syscon_np)
+		return ERR_PTR(-ENODEV);
+
+	regmap = device_node_to_regmap(syscon_np);
+	of_node_put(syscon_np);
+
+	return regmap;
+}
+
 static int aspeed_video_init(struct aspeed_video *video)
 {
 	int irq;
 	int rc;
 	struct device *dev = video->dev;
 
+	video->scu = aspeed_regmap_lookup(dev->of_node, "aspeed,scu");
+	video->gfx = aspeed_regmap_lookup(dev->of_node, "aspeed,gfx");
+
 	irq = irq_of_parse_and_map(dev->of_node, 0);
 	if (!irq) {
 		dev_err(dev, "Unable to find IRQ\n");
include/uapi/linux/aspeed-video.h +7 -0
index 6586a65548c4..44173be4c8dd 100644
@@ -8,6 +8,13 @@
 
 #include <linux/v4l2-controls.h>
 
+// enum for aspeed video's v4l2 s_input
+enum aspeed_video_input {
+	VIDEO_INPUT_VGA = 0,
+	VIDEO_INPUT_GFX,
+	VIDEO_INPUT_MAX
+};
+
 #define V4L2_CID_ASPEED_HQ_MODE			(V4L2_CID_USER_ASPEED_BASE  + 1)
 #define V4L2_CID_ASPEED_HQ_JPEG_QUALITY		(V4L2_CID_USER_ASPEED_BASE  + 2)
 

base-commit: e9d22f7a6655941fc8b2b942ed354ec780936b3e

Signature · 1 line
2.25.1
#1 lore raw

Dear Jammy,

Thank you for your patch.

If you send from your Google Mail address you should still add your company address as the author one, so it matches the Signed-off-by line.

Some minor comments below.

For the summary/title, I?d use:

Quoted 1 line

media: aspeed: Allow to capture from SoC display (GFX)

Am 04.07.24 um 09:55 schrieb Jammy Huang:

Quoted 1 line

ASPEED BMC IC has 2 different display engines.

I?d add a blank line.

Quoted 2 lines

1. VGA on PCIe
2. SoC Display(GFX)

Please add a space before (.

Quoted 1 line

By default, video engine(VE) will capture video from VGA. This patch

Ditto.

Quoted 1 line

adds an option to caputre video from GFX with standard ioctl,

cap*tu*re

Quoted 8 lines

vidioc_s_input.

An enum, aspeed_video_input, is added for this purpose. enum aspeed_video_input {
VIDEO_INPUT_VGA = 0,
VIDEO_INPUT_GFX,
VIDEO_INPUT_MAX
};

Please add a new paragraph how you tested this and how to test this. Maybe also paste the new log lines.

Quoted 32 lines
---
  drivers/media/platform/aspeed/aspeed-video.c | 177 ++++++++++++++++---
  include/uapi/linux/aspeed-video.h            |   7 +
  2 files changed, 158 insertions(+), 26 deletions(-)
drivers/media/platform/aspeed/aspeed-video.c +11 -0
index fc6050e3be0d..da5bf512a8ab 100644
@@ -25,6 +25,8 @@
  #include <linux/workqueue.h>
  #include <linux/debugfs.h>
  #include <linux/ktime.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
  #include <media/v4l2-ctrls.h>
  #include <media/v4l2-dev.h>
  #include <media/v4l2-device.h>
@@ -203,6 +205,25 @@
  #define VE_MEM_RESTRICT_START		0x310
  #define VE_MEM_RESTRICT_END		0x314
 
+// SCU's registers
+#define SCU_MISC_CTRL			0xC0
+#define  SCU_DPLL_SOURCE		BIT(20)
+
+// GFX's registers
+#define GFX_CTRL			0x60
+#define  GFX_CTRL_ENABLE		BIT(0)
+#define  GFX_CTRL_FMT			GENMASK(9, 7)
+

drivers/media/platform/aspeed/aspeed-video.c line 226

Quoted 10 lines
drivers/media/platform/aspeed/aspeed-video.c +10 -0
+#define GFX_H_DISPLAY			0x70
+#define  GFX_H_DISPLAY_DE		GENMASK(28, 16)
+#define  GFX_H_DISPLAY_TOTAL		GENMASK(12, 0)
+
+#define GFX_V_DISPLAY			0x78
+#define  GFX_V_DISPLAY_DE		GENMASK(27, 16)
+#define  GFX_V_DISPLAY_TOTAL		GENMASK(11, 0)
+
+#define GFX_DISPLAY_ADDR		0x80
+

Mention the datasheet name and revision in the commit message?

Quoted 88 lines
drivers/media/platform/aspeed/aspeed-video.c +28 -2
  /*
   * VIDEO_MODE_DETECT_DONE:	a flag raised if signal lock
   * VIDEO_RES_CHANGE:		a flag raised if res_change work on-going
@@ -273,6 +294,7 @@ struct aspeed_video_perf {
   * yuv420:		a flag raised if JPEG subsampling is 420
   * format:		holds the video format
   * hq_mode:		a flag raised if HQ is enabled. Only for VIDEO_FMT_ASPEED
+ * input:		holds the video input
   * frame_rate:		holds the frame_rate
   * jpeg_quality:	holds jpeq's quality (0~11)
   * jpeg_hq_quality:	holds hq's quality (1~12) only if hq_mode enabled
@@ -298,6 +320,8 @@ struct aspeed_video {
  	struct video_device vdev;
  	struct mutex video_lock;	/* v4l2 and videobuf2 lock */
 
+	struct regmap *scu;
+	struct regmap *gfx;
  	u32 jpeg_mode;
  	u32 comp_size_read;
 
@@ -316,6 +340,7 @@ struct aspeed_video {
  	bool yuv420;
  	enum aspeed_video_format format;
  	bool hq_mode;
+	enum aspeed_video_input input;
  	unsigned int frame_rate;
  	unsigned int jpeg_quality;
  	unsigned int jpeg_hq_quality;
@@ -485,6 +510,7 @@ static const struct v4l2_dv_timings_cap aspeed_video_timings_cap = {
 
  static const char * const format_str[] = {"Standard JPEG",
  	"Aspeed JPEG"};
+static const char * const input_str[] = {"VGA", "BMC GFX"};
 
  static unsigned int debug;
 
@@ -609,6 +635,14 @@ static int aspeed_video_start_frame(struct aspeed_video *video)
  		aspeed_video_free_buf(video, &video->bcd);
  	}
 
+	if (video->input == VIDEO_INPUT_GFX) {
+		u32 val;
+
+		// update input buffer address as gfx's
+		regmap_read(video->gfx, GFX_DISPLAY_ADDR, &val);
+		aspeed_video_write(video, VE_TGS_0, val);
+	}
+
  	spin_lock_irqsave(&video->lock, flags);
  	buf = list_first_entry_or_null(&video->buffers,
  				       struct aspeed_video_buffer, link);
@@ -1026,9 +1060,23 @@ static void aspeed_video_get_timings(struct aspeed_video *v,
  	}
  }
 
+static void aspeed_video_get_resolution_gfx(struct aspeed_video *video,
+					    struct v4l2_bt_timings *det)
+{
+	u32 h_val, v_val;
+
+	regmap_read(video->gfx, GFX_H_DISPLAY, &h_val);
+	regmap_read(video->gfx, GFX_V_DISPLAY, &v_val);
+
+	det->width = FIELD_GET(GFX_H_DISPLAY_DE, h_val) + 1;
+	det->height = FIELD_GET(GFX_V_DISPLAY_DE, v_val) + 1;
+	video->v4l2_input_status = 0;
+}
+
  #define res_check(v) test_and_clear_bit(VIDEO_MODE_DETECT_DONE, &(v)->flags)
 
-static void aspeed_video_get_resolution(struct aspeed_video *video)
+static void aspeed_video_get_resolution_vga(struct aspeed_video *video,
+					    struct v4l2_bt_timings *det)
  {
  	bool invalid_resolution = true;
  	int rc;
@@ -1036,7 +1084,6 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
  	u32 mds;
  	u32 src_lr_edge;
  	u32 src_tb_edge;
-	struct v4l2_bt_timings *det = &video->detected_timings;
 
  	det->width = MIN_WIDTH;
  	det->height = MIN_HEIGHT;
@@ -1113,14 +1160,20 @@ static void aspeed_video_get_resolution(struct aspeed_video *video)
 
  	aspeed_video_get_timings(video, det);
 

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_get_resolution(struct aspeed_video *video) · line 1166

Quoted 10 lines
drivers/media/platform/aspeed/aspeed-video.c +2 -6
-	/*
-	 * Enable mode-detect watchdog, resolution-change watchdog and
-	 * automatic compression after frame capture.
-	 */
+	/* Enable mode-detect watchdog, resolution-change watchdog */
  	aspeed_video_update(video, VE_INTERRUPT_CTRL, 0,
  			    VE_INTERRUPT_MODE_DETECT_WD);
-	aspeed_video_update(video, VE_SEQ_CTRL, 0,
-			    VE_SEQ_CTRL_AUTO_COMP | VE_SEQ_CTRL_EN_WATCHDOG);
+	aspeed_video_update(video, VE_SEQ_CTRL, 0, VE_SEQ_CTRL_EN_WATCHDOG);

What happenned with the compression? Please mention this in the commit message.

Quoted 142 lines
drivers/media/platform/aspeed/aspeed-video.c +59 -11
+}
+
+static void aspeed_video_get_resolution(struct aspeed_video *video)
+{
+	struct v4l2_bt_timings *det = &video->detected_timings;
+
+	if (video->input == VIDEO_INPUT_GFX)
+		aspeed_video_get_resolution_gfx(video, det);
+	else
+		aspeed_video_get_resolution_vga(video, det);
 
  	v4l2_dbg(1, debug, &video->v4l2_dev, "Got resolution: %dx%d\n",
  		 det->width, det->height);
@@ -1156,7 +1209,7 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
  	aspeed_video_write(video, VE_SRC_SCANLINE_OFFSET, act->width * 4);
 
  	/* Don't use direct mode below 1024 x 768 (irqs don't fire) */
-	if (size < DIRECT_FETCH_THRESHOLD) {
+	if (video->input == VIDEO_INPUT_VGA && size < DIRECT_FETCH_THRESHOLD) {
  		v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Sync Mode\n");
  		aspeed_video_write(video, VE_TGS_0,
  				   FIELD_PREP(VE_TGS_FIRST,
@@ -1171,10 +1224,20 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
  				    VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH,
  				    VE_CTRL_INT_DE);
  	} else {
+		u32 ctrl, val, bpp;
+
  		v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Direct Mode\n");
+		ctrl = VE_CTRL_DIRECT_FETCH;
+		if (video->input == VIDEO_INPUT_GFX) {
+			regmap_read(video->gfx, GFX_CTRL, &val);
+			bpp = FIELD_GET(GFX_CTRL_FMT, val) ? 32 : 16;
+			if (bpp == 16)
+				ctrl |= VE_CTRL_INT_DE;
+			aspeed_video_write(video, VE_TGS_1, act->width * (bpp >> 3));
+		}
  		aspeed_video_update(video, VE_CTRL,
  				    VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH,
-				    VE_CTRL_DIRECT_FETCH);
+				    ctrl);
  	}
 
  	size *= 4;
@@ -1207,6 +1270,22 @@ static void aspeed_video_set_resolution(struct aspeed_video *video)
  		aspeed_video_free_buf(video, &video->srcs[0]);
  }
 
+/*
+ * Update relative parameters when timing changed.
+ *
+ * @video: the struct of aspeed_video
+ * @timings: the new timings
+ */
+static void aspeed_video_update_timings(struct aspeed_video *video, struct v4l2_bt_timings *timings)
+{
+	video->active_timings = *timings;
+	aspeed_video_set_resolution(video);
+
+	video->pix_fmt.width = timings->width;
+	video->pix_fmt.height = timings->height;
+	video->pix_fmt.sizeimage = video->max_compressed_size;
+}
+
  static void aspeed_video_update_regs(struct aspeed_video *video)
  {
  	u8 jpeg_hq_quality = clamp((int)video->jpeg_hq_quality - 1, 0,
@@ -1219,6 +1298,8 @@ static void aspeed_video_update_regs(struct aspeed_video *video)
  	u32 ctrl = 0;
  	u32 seq_ctrl = 0;
 
+	v4l2_dbg(1, debug, &video->v4l2_dev, "input(%s)\n",
+		 input_str[video->input]);
  	v4l2_dbg(1, debug, &video->v4l2_dev, "framerate(%d)\n",
  		 video->frame_rate);
  	v4l2_dbg(1, debug, &video->v4l2_dev, "jpeg format(%s) subsample(%s)\n",
@@ -1234,6 +1315,9 @@ static void aspeed_video_update_regs(struct aspeed_video *video)
  	else
  		aspeed_video_update(video, VE_BCD_CTRL, VE_BCD_CTRL_EN_BCD, 0);
 
+	if (video->input == VIDEO_INPUT_VGA)
+		ctrl |= VE_CTRL_AUTO_OR_CURSOR;
+
  	if (video->frame_rate)
  		ctrl |= FIELD_PREP(VE_CTRL_FRC, video->frame_rate);
 
@@ -1252,7 +1336,9 @@ static void aspeed_video_update_regs(struct aspeed_video *video)
  	aspeed_video_update(video, VE_SEQ_CTRL,
  			    video->jpeg_mode | VE_SEQ_CTRL_YUV420,
  			    seq_ctrl);
-	aspeed_video_update(video, VE_CTRL, VE_CTRL_FRC, ctrl);
+	aspeed_video_update(video, VE_CTRL,
+			    VE_CTRL_FRC | VE_CTRL_AUTO_OR_CURSOR |
+			    VE_CTRL_SOURCE, ctrl);
  	aspeed_video_update(video, VE_COMP_CTRL,
  			    VE_COMP_CTRL_DCT_LUM | VE_COMP_CTRL_DCT_CHR |
  			    VE_COMP_CTRL_EN_HQ | VE_COMP_CTRL_HQ_DCT_LUM |
@@ -1280,6 +1366,7 @@ static void aspeed_video_init_regs(struct aspeed_video *video)
  	aspeed_video_write(video, VE_JPEG_ADDR, video->jpeg.dma);
 
  	/* Set control registers */
+	aspeed_video_write(video, VE_SEQ_CTRL, VE_SEQ_CTRL_AUTO_COMP);
  	aspeed_video_write(video, VE_CTRL, ctrl);
  	aspeed_video_write(video, VE_COMP_CTRL, VE_COMP_CTRL_RSVD);
 
@@ -1311,12 +1398,7 @@ static void aspeed_video_start(struct aspeed_video *video)
  	aspeed_video_get_resolution(video);
 
  	/* Set timings since the device is being opened for the first time */
-	video->active_timings = video->detected_timings;
-	aspeed_video_set_resolution(video);
-
-	video->pix_fmt.width = video->active_timings.width;
-	video->pix_fmt.height = video->active_timings.height;
-	video->pix_fmt.sizeimage = video->max_compressed_size;
+	aspeed_video_update_timings(video, &video->detected_timings);
  }
 
  static void aspeed_video_stop(struct aspeed_video *video)
@@ -1414,15 +1496,44 @@ static int aspeed_video_enum_input(struct file *file, void *fh,
 
  static int aspeed_video_get_input(struct file *file, void *fh, unsigned int *i)
  {
-	*i = 0;
+	struct aspeed_video *video = video_drvdata(file);
+
+	*i = video->input;
 
  	return 0;
  }
 
  static int aspeed_video_set_input(struct file *file, void *fh, unsigned int i)
  {
-	if (i)
+	struct aspeed_video *video = video_drvdata(file);
+
+	if (i >= VIDEO_INPUT_MAX)
+		return -EINVAL;
+
+	if (IS_ERR(video->scu)) {
+		v4l2_dbg(1, debug, &video->v4l2_dev, "%s: scu isn't ready for input-control\n", __func__);
+		return -EINVAL;

drivers/media/platform/aspeed/aspeed-video.c static int aspeed_video_enum_input(struct file *file, void *fh, · line 1525

Quoted 10 lines
drivers/media/platform/aspeed/aspeed-video.c +9 -0
+	}
+
+	if (IS_ERR(video->gfx) && i == VIDEO_INPUT_GFX) {
+		v4l2_dbg(1, debug, &video->v4l2_dev, "%s: gfx isn't ready for GFX input\n", __func__);
  		return -EINVAL;
+	}
+
+	video->input = i;
+
+	// modify dpll source per current input

I?d use C89 style comments.

Quoted 88 lines
drivers/media/platform/aspeed/aspeed-video.c +32 -7
+	if (video->input == VIDEO_INPUT_VGA)
+		regmap_update_bits(video->scu, SCU_MISC_CTRL, SCU_DPLL_SOURCE, 0);
+	else
+		regmap_update_bits(video->scu, SCU_MISC_CTRL, SCU_DPLL_SOURCE, SCU_DPLL_SOURCE);
+
+	aspeed_video_update_regs(video);
+
+	// update signal status
+	aspeed_video_get_resolution(video);
+	if (!video->v4l2_input_status)
+		aspeed_video_update_timings(video, &video->detected_timings);
 
  	return 0;
  }
@@ -1527,13 +1638,7 @@ static int aspeed_video_set_dv_timings(struct file *file, void *fh,
  	if (vb2_is_busy(&video->queue))
  		return -EBUSY;
 
-	video->active_timings = timings->bt;
-
-	aspeed_video_set_resolution(video);
-
-	video->pix_fmt.width = timings->bt.width;
-	video->pix_fmt.height = timings->bt.height;
-	video->pix_fmt.sizeimage = video->max_compressed_size;
+	aspeed_video_update_timings(video, &timings->bt);
 
  	timings->type = V4L2_DV_BT_656_1120;
 
@@ -1911,6 +2016,7 @@ static int aspeed_video_debugfs_show(struct seq_file *s, void *data)
  	val08 = aspeed_video_read(v, VE_CTRL);
  	if (FIELD_GET(VE_CTRL_DIRECT_FETCH, val08)) {
  		seq_printf(s, "  %-20s:\tDirect fetch\n", "Mode");
+		seq_printf(s, "  %-20s:\t%s\n", "Input", input_str[v->input]);
  		seq_printf(s, "  %-20s:\t%s\n", "VGA bpp mode",
  			   FIELD_GET(VE_CTRL_INT_DE, val08) ? "16" : "32");
  	} else {
@@ -2070,12 +2176,31 @@ static int aspeed_video_setup_video(struct aspeed_video *video)
  	return 0;
  }
 
+// Get regmap without checking res, such as clk/reset, that could lead to conflict.
+static struct regmap *aspeed_regmap_lookup(struct device_node *np, const char *property)
+{
+	struct device_node *syscon_np;
+	struct regmap *regmap;
+
+	syscon_np = of_parse_phandle(np, property, 0);
+	if (!syscon_np)
+		return ERR_PTR(-ENODEV);
+
+	regmap = device_node_to_regmap(syscon_np);
+	of_node_put(syscon_np);
+
+	return regmap;
+}
+
  static int aspeed_video_init(struct aspeed_video *video)
  {
  	int irq;
  	int rc;
  	struct device *dev = video->dev;
 
+	video->scu = aspeed_regmap_lookup(dev->of_node, "aspeed,scu");
+	video->gfx = aspeed_regmap_lookup(dev->of_node, "aspeed,gfx");
+
  	irq = irq_of_parse_and_map(dev->of_node, 0);
  	if (!irq) {
  		dev_err(dev, "Unable to find IRQ\n");
include/uapi/linux/aspeed-video.h +7 -0
index 6586a65548c4..44173be4c8dd 100644
@@ -8,6 +8,13 @@
 
  #include <linux/v4l2-controls.h>
 
+// enum for aspeed video's v4l2 s_input
+enum aspeed_video_input {
+	VIDEO_INPUT_VGA = 0,
+	VIDEO_INPUT_GFX,
+	VIDEO_INPUT_MAX
+};
+
  #define V4L2_CID_ASPEED_HQ_MODE			(V4L2_CID_USER_ASPEED_BASE  + 1)
  #define V4L2_CID_ASPEED_HQ_JPEG_QUALITY		(V4L2_CID_USER_ASPEED_BASE  + 2)
 
Quoted 1 line

base-commit: e9d22f7a6655941fc8b2b942ed354ec780936b3e

Kind regards,

Paul

#2 lore raw

Hi Paul,

Thanks for your help. I will modify accordingly.
I will list datasheet(not public available) and SDK_User_Guide in the comments for reference.

When the reg, VE_SEQ_CTRL_AUTO_COMP, is enabled, video capture engine and video compression engine can work together to automatically capture and compress frame. If it is not enabled, you will need to manually wait until capture done before start compressing.
I move VE_SEQ_CTRL_AUTO_COMP to aspeed_video_init_regs(), since it is always enabled.

Regards,
Jammy Huang

************* Email Confidentiality Notice ********************
DISCLAIMER:
This message (and any attachments) may contain legally privileged and/or other confidential information. If you have received it in error, please notify the sender by reply e-mail and immediately delete the e-mail and any attachments without copying or disclosing the contents. Thank you.

Quoted 488 lines

-----Original Message-----
From: Paul Menzel <[email protected]>
Sent: Friday, July 5, 2024 3:10 PM
To: Jammy Huang <[email protected]>
Cc: eajames at linux.ibm.com; mchehab at kernel.org; joel at jms.id.au; andrew at aj.id.au; linux-media at vger.kernel.org; openbmc at lists.ozlabs.org; linux-arm-kernel at lists.infradead.org; linux-aspeed at lists.ozlabs.org; linux-kernel at vger.kernel.org; Jammy Huang <[email protected]>
Subject: Re: [PATCH] media: aspeed: Add additional input type, GFX, to capture

Dear Jammy,

Thank you for your patch.

If you send from your Google Mail address you should still add your company address as the author one, so it matches the Signed-off-by line.

Some minor comments below.

For the summary/title, I?d use:

Quoted 1 line

media: aspeed: Allow to capture from SoC display (GFX)

Am 04.07.24 um 09:55 schrieb Jammy Huang:

Quoted 1 line

ASPEED BMC IC has 2 different display engines.

I?d add a blank line.

Quoted 2 lines

1. VGA on PCIe
2. SoC Display(GFX)

Please add a space before (.

Quoted 1 line

By default, video engine(VE) will capture video from VGA. This patch

Ditto.

Quoted 1 line

adds an option to caputre video from GFX with standard ioctl,

cap*tu*re

Quoted 8 lines

vidioc_s_input.

An enum, aspeed_video_input, is added for this purpose. enum aspeed_video_input {
VIDEO_INPUT_VGA = 0,
VIDEO_INPUT_GFX,
VIDEO_INPUT_MAX
};

Please add a new paragraph how you tested this and how to test this. Maybe also paste the new log lines.

Quoted 3 lines
---
  drivers/media/platform/aspeed/aspeed-video.c | 177

++++++++++++++++---

Quoted 30 lines
  include/uapi/linux/aspeed-video.h            |   7 +
  2 files changed, 158 insertions(+), 26 deletions(-)
drivers/media/platform/aspeed/aspeed-video.c +11 -0
index fc6050e3be0d..da5bf512a8ab 100644
@@ -25,6 +25,8 @@
  #include <linux/workqueue.h>
  #include <linux/debugfs.h>
  #include <linux/ktime.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
  #include <media/v4l2-ctrls.h>
  #include <media/v4l2-dev.h>
  #include <media/v4l2-device.h>
@@ -203,6 +205,25 @@
  #define VE_MEM_RESTRICT_START		0x310
  #define VE_MEM_RESTRICT_END		0x314
 
+// SCU's registers
+#define SCU_MISC_CTRL			0xC0
+#define  SCU_DPLL_SOURCE		BIT(20)
+
+// GFX's registers
+#define GFX_CTRL			0x60
+#define  GFX_CTRL_ENABLE		BIT(0)
+#define  GFX_CTRL_FMT			GENMASK(9, 7)
+

drivers/media/platform/aspeed/aspeed-video.c line 226

Quoted 10 lines
drivers/media/platform/aspeed/aspeed-video.c +10 -0
+#define GFX_H_DISPLAY			0x70
+#define  GFX_H_DISPLAY_DE		GENMASK(28, 16)
+#define  GFX_H_DISPLAY_TOTAL		GENMASK(12, 0)
+
+#define GFX_V_DISPLAY			0x78
+#define  GFX_V_DISPLAY_DE		GENMASK(27, 16)
+#define  GFX_V_DISPLAY_TOTAL		GENMASK(11, 0)
+
+#define GFX_DISPLAY_ADDR		0x80
+

Mention the datasheet name and revision in the commit message?

drivers/media/platform/aspeed/aspeed-video.c

Quoted 3 lines
drivers/media/platform/aspeed/aspeed-video.c +0 -0
  /*
   * VIDEO_MODE_DETECT_DONE:	a flag raised if signal lock
   * VIDEO_RES_CHANGE:		a flag raised if res_change work

on-going

drivers/media/platform/aspeed/aspeed-video.c struct aspeed_video_perf { · line 296

Quoted 4 lines
drivers/media/platform/aspeed/aspeed-video.c +0 -0
@@ -273,6 +294,7 @@ struct aspeed_video_perf {
   * yuv420:		a flag raised if JPEG subsampling is 420
   * format:		holds the video format
   * hq_mode:		a flag raised if HQ is enabled. Only for

VIDEO_FMT_ASPEED

drivers/media/platform/aspeed/aspeed-video.c struct aspeed_video_perf {

Quoted 4 lines
drivers/media/platform/aspeed/aspeed-video.c +1 -0
+ * input:		holds the video input
   * frame_rate:		holds the frame_rate
   * jpeg_quality:	holds jpeq's quality (0~11)
   * jpeg_hq_quality:	holds hq's quality (1~12) only if hq_mode

enabled

drivers/media/platform/aspeed/aspeed-video.c static int aspeed_video_start_frame(struct

Quoted 27 lines
drivers/media/platform/aspeed/aspeed-video.c +4 -0
@@ -298,6 +320,8 @@ struct aspeed_video {
  	struct video_device vdev;
  	struct mutex video_lock;	/* v4l2 and videobuf2 lock */
 
+	struct regmap *scu;
+	struct regmap *gfx;
  	u32 jpeg_mode;
  	u32 comp_size_read;
 
@@ -316,6 +340,7 @@ struct aspeed_video {
  	bool yuv420;
  	enum aspeed_video_format format;
  	bool hq_mode;
+	enum aspeed_video_input input;
  	unsigned int frame_rate;
  	unsigned int jpeg_quality;
  	unsigned int jpeg_hq_quality;
@@ -485,6 +510,7 @@ static const struct v4l2_dv_timings_cap
 aspeed_video_timings_cap = {
 
  static const char * const format_str[] = {"Standard JPEG",
  	"Aspeed JPEG"};
+static const char * const input_str[] = {"VGA", "BMC GFX"};
 
  static unsigned int debug;
@@ -609,6 +635,14 @@ static int aspeed_video_start_frame(struct

aspeed_video *video)

Quoted 4 lines
drivers/media/platform/aspeed/aspeed-video.c +1 -0
  		aspeed_video_free_buf(video, &video->bcd);
  	}
 
+	if (video->input == VIDEO_INPUT_GFX) {

drivers/media/platform/aspeed/aspeed-video.c static int aspeed_video_start_frame(struct aspeed_video *video)

Quoted 10 lines
drivers/media/platform/aspeed/aspeed-video.c +7 -0
+		u32 val;
+
+		// update input buffer address as gfx's
+		regmap_read(video->gfx, GFX_DISPLAY_ADDR, &val);
+		aspeed_video_write(video, VE_TGS_0, val);
+	}
+
  	spin_lock_irqsave(&video->lock, flags);
  	buf = list_first_entry_or_null(&video->buffers,
  				       struct aspeed_video_buffer, link); @@

-1026,9 +1060,23 @@

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_get_resolution(struct

Quoted 26 lines

static void aspeed_video_get_timings(struct aspeed_video *v,
}
}

drivers/media/platform/aspeed/aspeed-video.c +12 -0
+static void aspeed_video_get_resolution_gfx(struct aspeed_video *video,
+					    struct v4l2_bt_timings *det) {
+	u32 h_val, v_val;
+
+	regmap_read(video->gfx, GFX_H_DISPLAY, &h_val);
+	regmap_read(video->gfx, GFX_V_DISPLAY, &v_val);
+
+	det->width = FIELD_GET(GFX_H_DISPLAY_DE, h_val) + 1;
+	det->height = FIELD_GET(GFX_V_DISPLAY_DE, v_val) + 1;
+	video->v4l2_input_status = 0;
+}
+
  #define res_check(v) test_and_clear_bit(VIDEO_MODE_DETECT_DONE,

&(v)->flags)

drivers/media/platform/aspeed/aspeed-video.c +2 -1
-static void aspeed_video_get_resolution(struct aspeed_video *video)
+static void aspeed_video_get_resolution_vga(struct aspeed_video *video,
+					    struct v4l2_bt_timings *det)
  {
  	bool invalid_resolution = true;
  	int rc;
@@ -1036,7 +1084,6 @@ static void aspeed_video_get_resolution(struct

aspeed_video *video)

Quoted 11 lines
drivers/media/platform/aspeed/aspeed-video.c +0 -1
  	u32 mds;
  	u32 src_lr_edge;
  	u32 src_tb_edge;
-	struct v4l2_bt_timings *det = &video->detected_timings;
 
  	det->width = MIN_WIDTH;
  	det->height = MIN_HEIGHT;
@@ -1113,14 +1160,20 @@ static void aspeed_video_get_resolution(struct
 aspeed_video *video)
 
  	aspeed_video_get_timings(video, det);

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_get_resolution(struct · line 1124

Quoted 10 lines
drivers/media/platform/aspeed/aspeed-video.c +1 -6
 
-	/*
-	 * Enable mode-detect watchdog, resolution-change watchdog and
-	 * automatic compression after frame capture.
-	 */
+	/* Enable mode-detect watchdog, resolution-change watchdog */
  	aspeed_video_update(video, VE_INTERRUPT_CTRL, 0,
  			    VE_INTERRUPT_MODE_DETECT_WD);
-	aspeed_video_update(video, VE_SEQ_CTRL, 0,
-			    VE_SEQ_CTRL_AUTO_COMP |

VE_SEQ_CTRL_EN_WATCHDOG);

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_get_resolution(struct · line 1167

Quoted 1 line
drivers/media/platform/aspeed/aspeed-video.c +1 -0
+	aspeed_video_update(video, VE_SEQ_CTRL, 0,

VE_SEQ_CTRL_EN_WATCHDOG);

What happenned with the compression? Please mention this in the commit message.

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_set_resolution(struct

Quoted 13 lines
drivers/media/platform/aspeed/aspeed-video.c +9 -0
+}
+
+static void aspeed_video_get_resolution(struct aspeed_video *video) {
+	struct v4l2_bt_timings *det = &video->detected_timings;
+
+	if (video->input == VIDEO_INPUT_GFX)
+		aspeed_video_get_resolution_gfx(video, det);
+	else
+		aspeed_video_get_resolution_vga(video, det);
 
  	v4l2_dbg(1, debug, &video->v4l2_dev, "Got resolution: %dx%d\n",
  		 det->width, det->height);
@@ -1156,7 +1209,7 @@ static void aspeed_video_set_resolution(struct

aspeed_video *video)

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_set_resolution(struct · line 1209

Quoted 1 line
drivers/media/platform/aspeed/aspeed-video.c +0 -0
  	aspeed_video_write(video, VE_SRC_SCANLINE_OFFSET, act->width *

4);

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_set_resolution(struct

Quoted 9 lines
drivers/media/platform/aspeed/aspeed-video.c +2 -1
  	/* Don't use direct mode below 1024 x 768 (irqs don't fire) */
-	if (size < DIRECT_FETCH_THRESHOLD) {
+	if (video->input == VIDEO_INPUT_VGA && size <
+DIRECT_FETCH_THRESHOLD) {
  		v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Sync Mode\n");
  		aspeed_video_write(video, VE_TGS_0,
  				   FIELD_PREP(VE_TGS_FIRST,
@@ -1171,10 +1224,20 @@ static void aspeed_video_set_resolution(struct

aspeed_video *video)

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_set_resolution(struct aspeed_video *video)

Quoted 6 lines
drivers/media/platform/aspeed/aspeed-video.c +2 -0
  				    VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH,
  				    VE_CTRL_INT_DE);
  	} else {
+		u32 ctrl, val, bpp;
+
  		v4l2_dbg(1, debug, &video->v4l2_dev, "Capture: Direct

Mode\n");

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_set_resolution(struct

Quoted 16 lines
drivers/media/platform/aspeed/aspeed-video.c +9 -1
+		ctrl = VE_CTRL_DIRECT_FETCH;
+		if (video->input == VIDEO_INPUT_GFX) {
+			regmap_read(video->gfx, GFX_CTRL, &val);
+			bpp = FIELD_GET(GFX_CTRL_FMT, val) ? 32 : 16;
+			if (bpp == 16)
+				ctrl |= VE_CTRL_INT_DE;
+			aspeed_video_write(video, VE_TGS_1, act->width * (bpp >> 3));
+		}
  		aspeed_video_update(video, VE_CTRL,
  				    VE_CTRL_INT_DE | VE_CTRL_DIRECT_FETCH,
-				    VE_CTRL_DIRECT_FETCH);
+				    ctrl);
  	}
 
  	size *= 4;
@@ -1207,6 +1270,22 @@ static void aspeed_video_set_resolution(struct

aspeed_video *video)

Quoted 12 lines
drivers/media/platform/aspeed/aspeed-video.c +9 -0
  		aspeed_video_free_buf(video, &video->srcs[0]);
  }
 
+/*
+ * Update relative parameters when timing changed.
+ *
+ * @video: the struct of aspeed_video
+ * @timings: the new timings
+ */
+static void aspeed_video_update_timings(struct aspeed_video *video,
+struct v4l2_bt_timings *timings) {
+	video->active_timings = *timings;

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_set_resolution(struct aspeed_video *video)

Quoted 10 lines
drivers/media/platform/aspeed/aspeed-video.c +6 -1
+	aspeed_video_set_resolution(video);
+
+	video->pix_fmt.width = timings->width;
+	video->pix_fmt.height = timings->height;
+	video->pix_fmt.sizeimage = video->max_compressed_size; }
+
  static void aspeed_video_update_regs(struct aspeed_video *video)
  {
  	u8 jpeg_hq_quality = clamp((int)video->jpeg_hq_quality - 1, 0, @@
-1219,6 +1298,8 @@ static void aspeed_video_update_regs(struct

aspeed_video *video)

Quoted 9 lines
  	u32 ctrl = 0;
  	u32 seq_ctrl = 0;
drivers/media/platform/aspeed/aspeed-video.c +2 -0
+	v4l2_dbg(1, debug, &video->v4l2_dev, "input(%s)\n",
+		 input_str[video->input]);
  	v4l2_dbg(1, debug, &video->v4l2_dev, "framerate(%d)\n",
  		 video->frame_rate);
  	v4l2_dbg(1, debug, &video->v4l2_dev, "jpeg format(%s)

subsample(%s)\n", @@ -1234,6 +1315,9 @@ static void

aspeed_video_update_regs(struct aspeed_video *video)

Quoted 2 lines

else
aspeed_video_update(video, VE_BCD_CTRL,

VE_BCD_CTRL_EN_BCD, 0);

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_update_regs(struct

Quoted 8 lines
drivers/media/platform/aspeed/aspeed-video.c +3 -0
+	if (video->input == VIDEO_INPUT_VGA)
+		ctrl |= VE_CTRL_AUTO_OR_CURSOR;
+
  	if (video->frame_rate)
  		ctrl |= FIELD_PREP(VE_CTRL_FRC, video->frame_rate);
@@ -1252,7 +1336,9 @@ static void aspeed_video_update_regs(struct

aspeed_video *video)

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_update_regs(struct aspeed_video *video)

Quoted 9 lines
drivers/media/platform/aspeed/aspeed-video.c +3 -1
  	aspeed_video_update(video, VE_SEQ_CTRL,
  			    video->jpeg_mode | VE_SEQ_CTRL_YUV420,
  			    seq_ctrl);
-	aspeed_video_update(video, VE_CTRL, VE_CTRL_FRC, ctrl);
+	aspeed_video_update(video, VE_CTRL,
+			    VE_CTRL_FRC | VE_CTRL_AUTO_OR_CURSOR |
+			    VE_CTRL_SOURCE, ctrl);
  	aspeed_video_update(video, VE_COMP_CTRL,
  			    VE_COMP_CTRL_DCT_LUM |

VE_COMP_CTRL_DCT_CHR |

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_update_regs(struct · line 1344

Quoted 1 line
drivers/media/platform/aspeed/aspeed-video.c +0 -0
  			    VE_COMP_CTRL_EN_HQ |

VE_COMP_CTRL_HQ_DCT_LUM | @@ -1280,6

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_init_regs(struct aspeed_video *video)

Quoted 7 lines

+1366,7 @@ static void aspeed_video_init_regs(struct aspeed_video *video)
aspeed_video_write(video, VE_JPEG_ADDR, video->jpeg.dma);

/* Set control registers */

drivers/media/platform/aspeed/aspeed-video.c +1 -0
+	aspeed_video_write(video, VE_SEQ_CTRL, VE_SEQ_CTRL_AUTO_COMP);
  	aspeed_video_write(video, VE_CTRL, ctrl);
  	aspeed_video_write(video, VE_COMP_CTRL,

VE_COMP_CTRL_RSVD);

drivers/media/platform/aspeed/aspeed-video.c static void aspeed_video_start(struct

Quoted 2 lines
drivers/media/platform/aspeed/aspeed-video.c +0 -0
@@ -1311,12 +1398,7 @@ static void aspeed_video_start(struct

aspeed_video *video)

Quoted 16 lines
drivers/media/platform/aspeed/aspeed-video.c +1 -7
  	aspeed_video_get_resolution(video);
 
  	/* Set timings since the device is being opened for the first time */
-	video->active_timings = video->detected_timings;
-	aspeed_video_set_resolution(video);
-
-	video->pix_fmt.width = video->active_timings.width;
-	video->pix_fmt.height = video->active_timings.height;
-	video->pix_fmt.sizeimage = video->max_compressed_size;
+	aspeed_video_update_timings(video, &video->detected_timings);
  }
 
  static void aspeed_video_stop(struct aspeed_video *video) @@
-1414,15 +1496,44 @@ static int aspeed_video_enum_input(struct file

*file, void *fh,

Quoted 1 line

static int aspeed_video_get_input(struct file *file, void *fh, unsigned int

*i)

Quoted 9 lines
  {
drivers/media/platform/aspeed/aspeed-video.c +3 -1
-	*i = 0;
+	struct aspeed_video *video = video_drvdata(file);
+
+	*i = video->input;
 
  	return 0;
  }
 

drivers/media/platform/aspeed/aspeed-video.c static int aspeed_video_enum_input(struct file *file, void *fh,

Quoted 10 lines
drivers/media/platform/aspeed/aspeed-video.c +7 -1
  static int aspeed_video_set_input(struct file *file, void *fh, unsigned int i)
  {
-	if (i)
+	struct aspeed_video *video = video_drvdata(file);
+
+	if (i >= VIDEO_INPUT_MAX)
+		return -EINVAL;
+
+	if (IS_ERR(video->scu)) {
+		v4l2_dbg(1, debug, &video->v4l2_dev, "%s: scu isn't ready for

input-control\n", __func__);

drivers/media/platform/aspeed/aspeed-video.c static int aspeed_video_enum_input(struct file *file, void *fh, · line 1525

Quoted 12 lines
drivers/media/platform/aspeed/aspeed-video.c +11 -0
+		return -EINVAL;
+	}
+
+	if (IS_ERR(video->gfx) && i == VIDEO_INPUT_GFX) {
+		v4l2_dbg(1, debug, &video->v4l2_dev, "%s: gfx isn't ready for GFX
+input\n", __func__);
  		return -EINVAL;
+	}
+
+	video->input = i;
+
+	// modify dpll source per current input

I?d use C89 style comments.

drivers/media/platform/aspeed/aspeed-video.c

Quoted 2 lines
drivers/media/platform/aspeed/aspeed-video.c +2 -0
+	if (video->input == VIDEO_INPUT_VGA)
+		regmap_update_bits(video->scu, SCU_MISC_CTRL,

SCU_DPLL_SOURCE, 0);

drivers/media/platform/aspeed/aspeed-video.c

Quoted 2 lines
drivers/media/platform/aspeed/aspeed-video.c +2 -0
+	else
+		regmap_update_bits(video->scu, SCU_MISC_CTRL,

SCU_DPLL_SOURCE,

drivers/media/platform/aspeed/aspeed-video.c static int aspeed_video_set_dv_timings(struct

Quoted 12 lines
drivers/media/platform/aspeed/aspeed-video.c +8 -0
+SCU_DPLL_SOURCE);
+
+	aspeed_video_update_regs(video);
+
+	// update signal status
+	aspeed_video_get_resolution(video);
+	if (!video->v4l2_input_status)
+		aspeed_video_update_timings(video, &video->detected_timings);
 
  	return 0;
  }
@@ -1527,13 +1638,7 @@ static int aspeed_video_set_dv_timings(struct

file *file, void *fh,

drivers/media/platform/aspeed/aspeed-video.c static int aspeed_video_debugfs_show(struct

Quoted 15 lines
drivers/media/platform/aspeed/aspeed-video.c +1 -7
  	if (vb2_is_busy(&video->queue))
  		return -EBUSY;
 
-	video->active_timings = timings->bt;
-
-	aspeed_video_set_resolution(video);
-
-	video->pix_fmt.width = timings->bt.width;
-	video->pix_fmt.height = timings->bt.height;
-	video->pix_fmt.sizeimage = video->max_compressed_size;
+	aspeed_video_update_timings(video, &timings->bt);
 
  	timings->type = V4L2_DV_BT_656_1120;
 
@@ -1911,6 +2016,7 @@ static int aspeed_video_debugfs_show(struct

seq_file *s, void *data)

drivers/media/platform/aspeed/aspeed-video.c static int aspeed_video_setup_video(struct

Quoted 8 lines
drivers/media/platform/aspeed/aspeed-video.c +1 -0
  	val08 = aspeed_video_read(v, VE_CTRL);
  	if (FIELD_GET(VE_CTRL_DIRECT_FETCH, val08)) {
  		seq_printf(s, "  %-20s:\tDirect fetch\n", "Mode");
+		seq_printf(s, "  %-20s:\t%s\n", "Input", input_str[v->input]);
  		seq_printf(s, "  %-20s:\t%s\n", "VGA bpp mode",
  			   FIELD_GET(VE_CTRL_INT_DE, val08) ? "16" : "32");
  	} else {
@@ -2070,12 +2176,31 @@ static int aspeed_video_setup_video(struct

aspeed_video *video)

drivers/media/platform/aspeed/aspeed-video.c static int aspeed_video_enum_input(struct file *file, void *fh,

Quoted 4 lines
drivers/media/platform/aspeed/aspeed-video.c +1 -0
  	return 0;
  }
 
+// Get regmap without checking res, such as clk/reset, that could lead to

conflict.

Quoted 33 lines
drivers/media/platform/aspeed/aspeed-video.c +18 -0
+static struct regmap *aspeed_regmap_lookup(struct device_node *np,
+const char *property) {
+	struct device_node *syscon_np;
+	struct regmap *regmap;
+
+	syscon_np = of_parse_phandle(np, property, 0);
+	if (!syscon_np)
+		return ERR_PTR(-ENODEV);
+
+	regmap = device_node_to_regmap(syscon_np);
+	of_node_put(syscon_np);
+
+	return regmap;
+}
+
  static int aspeed_video_init(struct aspeed_video *video)
  {
  	int irq;
  	int rc;
  	struct device *dev = video->dev;
 
+	video->scu = aspeed_regmap_lookup(dev->of_node, "aspeed,scu");
+	video->gfx = aspeed_regmap_lookup(dev->of_node, "aspeed,gfx");
+
  	irq = irq_of_parse_and_map(dev->of_node, 0);
  	if (!irq) {
  		dev_err(dev, "Unable to find IRQ\n"); diff --git

a/include/uapi/linux/aspeed-video.h
b/include/uapi/linux/aspeed-video.h
index 6586a65548c4..44173be4c8dd 100644

include/uapi/linux/aspeed-video.h line 17

Quoted 10 lines
include/uapi/linux/aspeed-video.h +6 -0
@@ -8,6 +8,13 @@
 
  #include <linux/v4l2-controls.h>
 
+// enum for aspeed video's v4l2 s_input enum aspeed_video_input {
+	VIDEO_INPUT_VGA = 0,
+	VIDEO_INPUT_GFX,
+	VIDEO_INPUT_MAX
+};
+
  #define V4L2_CID_ASPEED_HQ_MODE
	(V4L2_CID_USER_ASPEED_BASE  + 1)

include/uapi/linux/aspeed-video.h line 18

Quoted 1 line
include/uapi/linux/aspeed-video.h +0 -0
  #define V4L2_CID_ASPEED_HQ_JPEG_QUALITY
	(V4L2_CID_USER_ASPEED_BASE  + 2)
Quoted 3 lines

base-commit: e9d22f7a6655941fc8b2b942ed354ec780936b3e

Kind regards,

Paul