shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

dts: add video11 and video12 for screenrecord [2/6]

Browse Source 
PD#SWPL-209

Problem:
add screenrecord function

Solution:
add video11 and video12 for screenrecord

Verify:
verify by t962_p321

Change-Id: I0d33d9d01704b6fe6e5c7dbeccb1fb2be68904b3
Signed-off-by: liangzhuo.xie <liangzhuo.xie@amlogic.com>
This commit is contained in:
liangzhuo.xie
2018-11-23 10:36:11 +08:00
committed by Jianxin Pan
parent c95d2a912e
commit c804280222
5 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/boot/dts/amlogic/txl_t962_p321.dts
View File

@@ -280,6 +280,22 @@
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
hdmirx {
compatible = "amlogic, hdmirx-txl";
status = "okay";

17
arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts
View File

@@ -280,6 +280,22 @@
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
hdmirx {
compatible = "amlogic, hdmirx-txl";
status = "okay";
@@ -1185,4 +1201,3 @@
memory-region = <&defendkey_reserved>;
status = "okay";
};

16
arch/arm64/boot/dts/amlogic/txl_t962_p321.dts
View File

@@ -272,6 +272,22 @@
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
hdmirx {
compatible = "amlogic, hdmirx-txl";
status = "okay";

16
arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts
View File

@@ -272,6 +272,22 @@
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
hdmirx {
compatible = "amlogic, hdmirx-txl";
status = "okay";

9
drivers/amlogic/media/video_processor/video_dev/amlvideo2.c
View File

@@ -77,7 +77,8 @@
/* #define USE_SEMA_QBUF */
/* #define USE_VDIN_PTS */
/* #define MULTI_NODE */
#define MULTI_NODE
#ifdef MULTI_NODE
#define MAX_SUB_DEV_NODE 2
#else
@@ -4647,8 +4648,8 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
#ifdef PREVIOUS_VOUT_MODE
static enum tvin_scan_mode_e vmode2scan_mode(enum vmode_e mode)
{
enum tvin_scan_mode_e scan_mode =
TVIN_SCAN_MODE_NULL;/* 1: progressive 2:interlaced */
enum tvin_scan_mode_e scan_mode = TVIN_SCAN_MODE_PROGRESSIVE;
//TVIN_SCAN_MODE_NULL;/* 1: progressive 2:interlaced */
switch (mode) {
case VMODE_480I:
@@ -5353,7 +5354,7 @@ int amlvideo2_cma_buf_init(struct amlvideo2_device *vid_dev, int node_id)
return -1;
}
} else {
flags = CODEC_MM_FLAGS_DMA |
flags = CODEC_MM_FLAGS_DMA_CPU|
CODEC_MM_FLAGS_CMA_CLEAR;
if (node_id == 0) {
if (vid_dev->node[node_id]->