From patchwork Mon Mar 20 10:28:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?WXVuZmVpIERvbmcgKOiRo+S6kemjnik=?= X-Patchwork-Id: 72089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1138238wrt; Mon, 20 Mar 2023 03:40:44 -0700 (PDT) X-Google-Smtp-Source: AK7set/bcFcU4I5ZZIM7ST1V5krz7ufIq2C7nls4HMnvlR42MSIwJmZpyMtMcDu2+Vu/vlhn1WGW X-Received: by 2002:a17:902:db07:b0:1a1:a146:f6d7 with SMTP id m7-20020a170902db0700b001a1a146f6d7mr15297600plx.4.1679308843727; Mon, 20 Mar 2023 03:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679308843; cv=none; d=google.com; s=arc-20160816; b=M0g3ylMUmoxd0WwJKm/D8jYKEtLKJWP5TxvYO69wW+IlBm1hYE9jc9V4qXH5idmijm lknKF2OEtRlDyX0YNEOaoKdJx5P+XxlOX6YA9Lyfe8y2IBmYTKFgAOMfXtsEalxliv8L 2lCw/ekwz4LwtmkHMOBCZG76E3C4FJ0nvWpHXSV2lGqWAqAEwPk4JV79lJZied4d4h8S LK3GH5i+7FoKlZEoPU33nQ4ABT7h864E8Gx2MzXmZmeXRyiEYXy5QeVv86Qt1Xv+9oB7 LoEUGO4Nm5yQGeGMknHuJg3KrEP4TJ8+FZYGpuf5d/ahlk55Et3EaHApZJya5qN6BJpa JSbA== 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:cc:to:from :dkim-signature; bh=H8eDDouoS55OjEH1GaOczO0hS5WxYzw2AeckE04g2o8=; b=UCXoZbfk1V3fUL1cwBwDtWqyF/PvIKxcK+DIyXwF1bIFKKRyxovJIJfU5hMYCYh7UL ndrKgD04k5rlxoaQWOO+C6HOOBPxrBcyy+Bd/KpS31gKAeEoFbpN8ls8msW1VTyEu0DB c7nOKMFXN9X0uWL4V5fLWc1fmsLlnlaG5XgqBbtvfkfGuvM8WuNwfRs/vZon4JhGrLtG +61J6nFaEnffjHu0+corcTu3XNiK0WOsMVdOOoKtu2MOc6Q4pcFqbigi9Wdr/ybPJE7p AveQ1ltBihzuNXoOGu1yLJxqX93zsd8Xi8Nc7tnhajDdND1n/rz9Bb3q6uH0j0BSCrgn rBGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=OTsbm6f+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b7-20020a170903228700b0016efde92292si10981840plh.255.2023.03.20.03.40.31; Mon, 20 Mar 2023 03:40:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=OTsbm6f+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229759AbjCTK3N (ORCPT + 99 others); Mon, 20 Mar 2023 06:29:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230165AbjCTK2y (ORCPT ); Mon, 20 Mar 2023 06:28:54 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25DBE18172; Mon, 20 Mar 2023 03:28:48 -0700 (PDT) X-UUID: fddf2b3cc70911edbd2e61cc88cc8f98-20230320 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=H8eDDouoS55OjEH1GaOczO0hS5WxYzw2AeckE04g2o8=; b=OTsbm6f+dqudX/bgXqZEj6aYrwWqLqTrB2E05PYQ+c+RQGyBSDee5YCHS8oWdza4XfG2WYWFjDFnDPL2OD8orYwPmS+V7kh/umU57bmOncDS4/yOepeO8cxdLMXnXkZAwRB4AfcSg7HtdbSXOvIJCd623qci644boTXY/IPKxrs=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:73b6540c-fa8d-4cf2-99c1-bdfbdcd1014b,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:120426c,CLOUDID:8984c8b3-beed-4dfc-bd9c-e1b22fa6ccc4,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-UUID: fddf2b3cc70911edbd2e61cc88cc8f98-20230320 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2044484837; Mon, 20 Mar 2023 18:28:44 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Mon, 20 Mar 2023 18:28:43 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Mon, 20 Mar 2023 18:28:42 +0800 From: Yunfei Dong To: Yunfei Dong , Chen-Yu Tsai , Nicolas Dufresne , Hans Verkuil , AngeloGioacchino Del Regno , Benjamin Gaignard , =?utf-8?q?N=C3=ADcolas?= =?utf-8?q?_F_=2E_R_=2E_A_=2E_Prado?= CC: Matthias Brugger , Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , Steve Cho , , , , , , Subject: [PATCH 3/6 RESEND] media: mediatek: vcodec: Add a debugfs file to get different useful information Date: Mon, 20 Mar 2023 18:28:35 +0800 Message-ID: <20230320102838.8313-4-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320102838.8313-1-yunfei.dong@mediatek.com> References: <20230320102838.8313-1-yunfei.dong@mediatek.com> MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,RDNS_NONE, SPF_HELO_PASS,SPF_PASS,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760882950333524649?= X-GMAIL-MSGID: =?utf-8?q?1760882950333524649?= In oder to get each instance information according to test command, adding one file node "vdec". Can use echo command to set different string value as 'echo -picinfo > vdec' to get real and aligned resolution. Signed-off-by: Yunfei Dong --- .../mediatek/vcodec/mtk_vcodec_dbgfs.c | 85 +++++++++++++++++++ .../mediatek/vcodec/mtk_vcodec_dbgfs.h | 20 +++++ .../mediatek/vcodec/mtk_vcodec_dec_drv.c | 2 + 3 files changed, 107 insertions(+) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c index bef78c028a75..9e7d57d21cea 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c @@ -10,6 +10,86 @@ #include "mtk_vcodec_drv.h" #include "mtk_vcodec_util.h" +static ssize_t mtk_vdec_dbgfs_write(struct file *filp, const char __user *ubuf, + size_t count, loff_t *ppos) +{ + struct mtk_vcodec_dev *vcodec_dev = filp->private_data; + char buf[32] = { 0 }; + int len, str_count = 0; + struct mtk_vcodec_dbgfs_inst *dbgfs_inst; + struct mtk_vcodec_ctx *ctx; + + len = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count); + if (len <= 0) + return len; + + list_for_each_entry(dbgfs_inst, &vcodec_dev->dbgfs.dbgfs_head, node) { + pr_info("dbgfs_inst id: %d\n", dbgfs_inst->inst_id); + ctx = dbgfs_inst->vcodec_ctx; + + if (strstr(buf, "-picinfo")) { + str_count++; + pr_info("resolution: real(%dx%d)=>align(%dx%d)\n", + ctx->picinfo.pic_w, ctx->picinfo.pic_h, + ctx->picinfo.buf_w, ctx->picinfo.buf_h); + } + } + + if (!str_count) { + pr_info("\t can not found useful cmd: %s\n", buf); + pr_info("\t -picinfo ex. echo -picinfo\n"); + } + + return count; +} + +static const struct file_operations vdec_fops = { + .open = simple_open, + .write = mtk_vdec_dbgfs_write, +}; + +void mtk_vcodec_dbgfs_create(struct mtk_vcodec_ctx *ctx) +{ + struct mtk_vcodec_dbgfs_inst *dbgfs_inst; + struct mtk_vcodec_dev *vcodec_dev = ctx->dev; + + dbgfs_inst = kzalloc(sizeof(*dbgfs_inst), GFP_KERNEL); + if (!dbgfs_inst) + return; + + list_add_tail(&dbgfs_inst->node, &vcodec_dev->dbgfs.dbgfs_head); + + vcodec_dev->dbgfs.inst_count++; + + dbgfs_inst->inst_id = ctx->id; + dbgfs_inst->vcodec_ctx = ctx; + + pr_info("dbgfs create: id(%d) total count: %d\n", dbgfs_inst->inst_id, + vcodec_dev->dbgfs.inst_count); +} +EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_create); + +void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dev *vcodec_dev, int ctx_id) +{ + struct mtk_vcodec_dbgfs_inst *dbgfs_inst; + + list_for_each_entry(dbgfs_inst, &vcodec_dev->dbgfs.dbgfs_head, node) { + if (dbgfs_inst && dbgfs_inst->inst_id == ctx_id) { + vcodec_dev->dbgfs.inst_count--; + pr_info("dbgfs_inst remove id: %d total count: %d\n", + dbgfs_inst->inst_id, + vcodec_dev->dbgfs.inst_count); + break; + } + } + + if (dbgfs_inst) { + list_del(&dbgfs_inst->node); + kfree(dbgfs_inst); + } +} +EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_remove); + void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev) { struct dentry *vcodec_root; @@ -22,6 +102,11 @@ void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev) debugfs_create_x32("mtk_v4l2_dbg_level", 0644, vcodec_root, &mtk_v4l2_dbg_level); debugfs_create_x32("mtk_vcodec_dbg", 0644, vcodec_root, &mtk_vcodec_dbg); + + INIT_LIST_HEAD(&vcodec_dev->dbgfs.dbgfs_head); + debugfs_create_file("vdec", 0200, vcodec_root, vcodec_dev, &vdec_fops); + + vcodec_dev->dbgfs.inst_count = 0; } EXPORT_SYMBOL_GPL(mtk_vcodec_dbgfs_init); diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h index 74f130f868c8..2d0b617e762e 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h @@ -8,15 +8,35 @@ #define __MTK_VCODEC_DBGFS_H__ struct mtk_vcodec_dev; +struct mtk_vcodec_ctx; + +struct mtk_vcodec_dbgfs_inst { + struct list_head node; + int inst_id; + struct mtk_vcodec_ctx *vcodec_ctx; +}; struct mtk_vcodec_dbgfs { + struct list_head dbgfs_head; struct dentry *vcodec_root; + int inst_count; }; #if defined(CONFIG_DEBUG_FS) +void mtk_vcodec_dbgfs_create(struct mtk_vcodec_ctx *ctx); +void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dev *vcodec_dev, int ctx_id); + void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev); void mtk_vcodec_dbgfs_deinit(struct mtk_vcodec_dev *vcodec_dev); #else +static inline void mtk_vcodec_dbgfs_create(struct mtk_vcodec_ctx *ctx) +{ +} + +static inline void mtk_vcodec_dbgfs_remove(struct mtk_vcodec_dev *vcodec_dev, int ctx_id) +{ +} + static inline void mtk_vcodec_dbgfs_init(struct mtk_vcodec_dev *vcodec_dev) { } diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c index de29b1fb0436..8c2443a18f5e 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_drv.c @@ -215,6 +215,7 @@ static int fops_vcodec_open(struct file *file) ctx->dev->vdec_pdata->init_vdec_params(ctx); list_add(&ctx->list, &dev->ctx_list); + mtk_vcodec_dbgfs_create(ctx); mutex_unlock(&dev->dev_mutex); mtk_v4l2_debug(0, "%s decoder [%d]", dev_name(&dev->plat_dev->dev), @@ -256,6 +257,7 @@ static int fops_vcodec_release(struct file *file) v4l2_fh_exit(&ctx->fh); v4l2_ctrl_handler_free(&ctx->ctrl_hdl); + mtk_vcodec_dbgfs_remove(dev, ctx->id); list_del_init(&ctx->list); kfree(ctx); mutex_unlock(&dev->dev_mutex);