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

Revert "Revert "dts: add video11 and video12 for screencontrol [2/6]""

Browse Source 
This reverts commit 22238af31a.

Change-Id: I7f1fa91c80a5536f04a6622ee049a4b840fee09e
This commit is contained in:
Chris KIM
2020-06-01 16:02:16 +09:00
parent 29de6b3a91
commit 3d007e4026
16 changed files with 261 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -303,6 +303,23 @@
dev_name = "ionvideo";
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>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

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

@@ -307,6 +307,23 @@
dev_name = "ionvideo";
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>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

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

@@ -303,6 +303,23 @@
dev_name = "ionvideo";
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>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

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

@@ -317,6 +317,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>;
};
gpio_keypad {
compatible = "amlogic, gpio_keypad";
status = "okay";

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

@@ -317,6 +317,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>;
};
gpio_keypad {
compatible = "amlogic, gpio_keypad";
status = "okay";

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

@@ -306,6 +306,23 @@
dev_name = "ionvideo";
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>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

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

@@ -332,6 +332,23 @@
dev_name = "ionvideo";
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>;
};
dvb {
compatible = "amlogic, dvb";
dev_name = "dvb";

17
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
View File

@@ -302,6 +302,23 @@
dev_name = "ionvideo";
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>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

17
arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
View File

@@ -301,6 +301,23 @@
dev_name = "ionvideo";
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>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

34
arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
View File

@@ -312,6 +312,23 @@
dev_name = "ionvideo";
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>;
};
/*dvb {
* compatible = "amlogic, dvb";
* dev_name = "dvb";
@@ -349,6 +366,23 @@
* clock-names = "demux", "ahbarb0", "parser_top";
*};
*/
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>;
};
unifykey{
compatible = "amlogic, unifykey";
status = "ok";

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

@@ -318,6 +318,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>;
};
gpio_keypad {
compatible = "amlogic, gpio_keypad";
status = "okay";

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

@@ -318,6 +318,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>;
};
gpio_keypad {
compatible = "amlogic, gpio_keypad";
status = "okay";

2
arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
View File

@@ -1299,7 +1299,7 @@
compatible = "amlogic, ge2d-sm1";
dev_name = "ge2d";
status = "okay";
interrupts = <0 146 1>;
interrupts = <0 150 1>;
interrupt-names = "ge2d";
clocks = <&clkc CLKID_VAPB_MUX>,
<&clkc CLKID_G2D>,

17
arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
View File

@@ -304,6 +304,23 @@
dev_name = "ionvideo";
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>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

17
arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
View File

@@ -368,6 +368,23 @@
dev_name = "ionvideo";
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>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

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

@@ -78,7 +78,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
@@ -4950,8 +4951,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:
@@ -5022,7 +5023,6 @@ static int amlvideo2_stop_tvin_service(struct amlvideo2_node *node)
vops->stop_tvin_service(node->vdin_device_num);
}
node->start_vdin_flag = 0;
return ret;
}
@@ -5036,7 +5036,7 @@ static int amlvideo2_start_tvin_service(struct amlvideo2_node *node)
vinfo = get_current_vinfo();
if ((!node->start_vdin_flag) || (node->r_type != AML_RECEIVER_NONE))
if (node->r_type != AML_RECEIVER_NONE)
goto start;
if (amlvideo2_dbg_en)
@@ -5186,7 +5186,7 @@ int amlvideo2_notify_callback(struct notifier_block *block, unsigned long cmd,
/* if local queue have vf , should give back to provider */
if (vfq_empty(&node->q_ready)) {
if (amlvideo2_dbg_en)
if (amlvideo2_dbg_en & 4)
pr_info("q_ready is empty .\n");
} else {
recycle_vf = vfq_pop(&node->q_ready);
@@ -5194,12 +5194,12 @@ int amlvideo2_notify_callback(struct notifier_block *block, unsigned long cmd,
vf_put(recycle_vf, node->recv.name);
recycle_vf = vfq_pop(&node->q_ready);
}
if (amlvideo2_dbg_en)
if (amlvideo2_dbg_en & 4)
pr_info("already flush local vf .\n");
}
/*debug provider vf state*/
if (amlvideo2_dbg_en) {
if (amlvideo2_dbg_en & 4) {
ret = vf_get_states(vfp, &states);
if (ret == 0) {
pr_info("vf_pool_size = %d, buf_free_num = %d .\n",
@@ -5217,7 +5217,7 @@ int amlvideo2_notify_callback(struct notifier_block *block, unsigned long cmd,
if (node->r_type == AML_RECEIVER_NONE)
amlvideo2_start_thread(node->fh);
msleep(500);
ret = amlvideo2_start_tvin_service(node);
if (ret < 0) {