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

video: rockchip: mpp: fix show sessions-summary info issue

Browse Source 
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ic89d8aff11d72d059fbbdbc27c4247cb8aabea73
This commit is contained in:
Yandong Lin
2022-07-13 16:21:42 +08:00
committed by Tao Huang
parent 9eee000945
commit aab4ed43cf
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/video/rockchip/mpp/mpp_common.c
View File

@@ -75,6 +75,7 @@ const char *mpp_device_name[MPP_DEVICE_BUTT] = {
[MPP_DEVICE_RKVENC] = "RKVENC",
[MPP_DEVICE_VEPU1] = "VEPU1",
[MPP_DEVICE_VEPU2] = "VEPU2",
[MPP_DEVICE_VEPU2_JPEG] = "VEPU2",
[MPP_DEVICE_VEPU22] = "VEPU22",
[MPP_DEVICE_IEP2] = "IEP2",
};

4
drivers/video/rockchip/mpp/mpp_rkvenc.c
View File

@@ -742,7 +742,7 @@ static int rkvenc_dump_session(struct mpp_session *session, struct seq_file *seq
}
seq_puts(seq, "\n");
/* item data*/
seq_printf(seq, "|%8p|", session);
seq_printf(seq, "|%8d|", session->index);
seq_printf(seq, "%8s|", mpp_device_name[session->device_type]);
for (i = ENC_INFO_BASE; i < ENC_INFO_BUTT; i++) {
u32 flag = priv->codec_info[i].flag;
@@ -775,7 +775,7 @@ static int rkvenc_show_session_info(struct seq_file *seq, void *offset)
mutex_lock(&mpp->srv->session_lock);
list_for_each_entry_safe(session, n,
&mpp->srv->session_list,
session_link) {
service_link) {
if (session->device_type != MPP_DEVICE_RKVENC)
continue;
if (!session->priv)

4
drivers/video/rockchip/mpp/mpp_rkvenc2.c
View File

@@ -1384,7 +1384,7 @@ static int rkvenc_dump_session(struct mpp_session *session, struct seq_file *seq
}
seq_puts(seq, "\n");
/* item data*/
seq_printf(seq, "|%8p|", session);
seq_printf(seq, "|%8d|", session->index);
seq_printf(seq, "%8s|", mpp_device_name[session->device_type]);
for (i = ENC_INFO_BASE; i < ENC_INFO_BUTT; i++) {
u32 flag = priv->codec_info[i].flag;
@@ -1417,7 +1417,7 @@ static int rkvenc_show_session_info(struct seq_file *seq, void *offset)
mutex_lock(&mpp->srv->session_lock);
list_for_each_entry_safe(session, n,
&mpp->srv->session_list,
session_link) {
service_link) {
if (session->device_type != MPP_DEVICE_RKVENC)
continue;
if (!session->priv)

4
drivers/video/rockchip/mpp/mpp_vepu1.c
View File

@@ -499,7 +499,7 @@ static int vepu_dump_session(struct mpp_session *session, struct seq_file *seq)
}
seq_puts(seq, "\n");
/* item data*/
seq_printf(seq, "|%8p|", session);
seq_printf(seq, "|%8d|", session->index);
seq_printf(seq, "%8s|", mpp_device_name[session->device_type]);
for (i = ENC_INFO_BASE; i < ENC_INFO_BUTT; i++) {
u32 flag = priv->codec_info[i].flag;
@@ -532,7 +532,7 @@ static int vepu_show_session_info(struct seq_file *seq, void *offset)
mutex_lock(&mpp->srv->session_lock);
list_for_each_entry_safe(session, n,
&mpp->srv->session_list,
session_link) {
service_link) {
if (session->device_type != MPP_DEVICE_VEPU1)
continue;
if (!session->priv)

7
drivers/video/rockchip/mpp/mpp_vepu2.c
View File

@@ -609,7 +609,7 @@ static int vepu_dump_session(struct mpp_session *session, struct seq_file *seq)
}
seq_puts(seq, "\n");
/* item data*/
seq_printf(seq, "|%8p|", session);
seq_printf(seq, "|%8d|", session->index);
seq_printf(seq, "%8s|", mpp_device_name[session->device_type]);
for (i = ENC_INFO_BASE; i < ENC_INFO_BUTT; i++) {
u32 flag = priv->codec_info[i].flag;
@@ -642,8 +642,9 @@ static int vepu_show_session_info(struct seq_file *seq, void *offset)
mutex_lock(&mpp->srv->session_lock);
list_for_each_entry_safe(session, n,
&mpp->srv->session_list,
session_link) {
if (session->device_type != MPP_DEVICE_VEPU2)
service_link) {
if (session->device_type != MPP_DEVICE_VEPU2 &&
session->device_type != MPP_DEVICE_VEPU2_JPEG)
continue;
if (!session->priv)
continue;