From patchwork Tue Jun 13 09:14:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Qian X-Patchwork-Id: 107211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp411527vqr; Tue, 13 Jun 2023 02:29:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ55VIN6+bcRvaSPAz9xuChmaN9y0oRC2Wll68ofAPx7Mn0Y7v6umzJgBrnlfv19//CHVBSR X-Received: by 2002:a05:6a20:7fa7:b0:11c:d2d0:6439 with SMTP id d39-20020a056a207fa700b0011cd2d06439mr3938887pzj.25.1686648564583; Tue, 13 Jun 2023 02:29:24 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686648564; cv=pass; d=google.com; s=arc-20160816; b=UJ7qfVkYmoUaaFIVlO+34903KbcZwqxoPC6lrrWrFe7VMeYIR+1stro8WHrJadAcxm gQb+zbWDoaeLQ3W/XMFgYMCP5Ru1Cv50CtqrZ1VMnmC0NCHDk2VmAW8YYiCU1y1w3NGc mz5GLjO18ApTMNgix9z95dCO4AQz4nQ+mExN367mKmGzR9wLxGyZt7WlL9OKjxzfLBlD LDj4lGmZYrt+o9Y3GksLyfOltd5Jj/6u0T7+Xau4dNKME1J1P43ApzVgSLJjg2bpPRdr Uxi/5GHerHt3NJXRXmA+QwBC/DiVJz5e5lWlUacd4gS/VmAbqJFyYmqHp1QQRvHHNKa4 xlYA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :message-id:date:subject:cc:to:from:dkim-signature; bh=AM2PtbcFDMDxN34Bj4aAyNZfiRnFXYbh5T8Wb4ig9ao=; b=VUMMt6kdroCM6C3XEW5UhXwkoJIBMs9nJqy8YXpshbSvOB31USqZJGnQwOAit0oFOT VLOVynQOHMLJJFi0WwwqvbEWsp8mWJ1Egtofh4xwT1OYFY7StP0kPhUrKNCnaeFiC3hM EBMEoaHPVIr5kbXpOvgfJLfVo+v5sNmVfUBRwHao14dZeYd5taYR6W2bd4A2fn9EgSoZ SLCIyVkfDnU7rf6M7INqCpvdISTJ6+k/Kx7aSszUEmsTPHrpspnIHbX325nfqkPej/gW pplDpxYcUEX3x6ovfYd5S7w4OCsTG1IfeGZI6JkMuVgrSv8NkTqQ0RBWObIxVJRK07rR +OQQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=ITG3RDRU; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); 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=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k11-20020a637b4b000000b0053427b6841dsi5117951pgn.337.2023.06.13.02.29.10; Tue, 13 Jun 2023 02:29:24 -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=@nxp.com header.s=selector2 header.b=ITG3RDRU; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); 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=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241829AbjFMJPE (ORCPT + 99 others); Tue, 13 Jun 2023 05:15:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240910AbjFMJPB (ORCPT ); Tue, 13 Jun 2023 05:15:01 -0400 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2070.outbound.protection.outlook.com [40.107.8.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D84EB18E; Tue, 13 Jun 2023 02:14:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Onx+YviQZooKxNskRa/8F6u8XfYM3uyVIaIpUESn7+5nPdmZ3ZUGRcw7aHa/5stUo9TPvMkPr6lRjuvh8eG0R5U7rAMl84t0YTGlgEdp+VLFUCCKKK4zShSeTly57Upo+1jM/yRCOyssxNmBurSLQqhnG62KLVcRCJC8OflmyB+nUhIGA4kgLbnHrU/kWH4MfHA4qtiW07al5E+hlNqCnH3xpLEt2extrhlgd0TCVdRCpt0Iw/IsGKD+oOB8jtmAfAzcw5w8SSEz+6UsX8qwONhzgbbUbVXHne15BQETMnRmkHdkmoMjeS4QJylabQpdSKCHPKQt1M6WdndCtfxQow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AM2PtbcFDMDxN34Bj4aAyNZfiRnFXYbh5T8Wb4ig9ao=; b=J+yUQ+R6jko9yf3QXFqT0lXJPMU9ZJxX0z/fC7QT+gPlIUHK1UtmXao34QideQPOm/1yichAXzMUZ4xjXNAw3ufRIMVLVh4nUd3if85HBTWeqhWZPCkFklDUTliYpkRLIeC73wmOebmKPSvk5k3HlXl8SPDTw7XwpF3CWal9c5Fj+YIDW77SC7DlBgbZjYXeE+LsfMd7KQmx2t6wyv5YJirrxoVM9Hgjbzw7opKmaTn9eSsfEohawkSOrnFjPJPzMvxho5xUzsjDeo1zAyR1O9tkkTZ9xd1KGmfiNC14mL1E/g+fyjwfOc/Tu+9S92FJSm8XSiR64PIM97EoaonkKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AM2PtbcFDMDxN34Bj4aAyNZfiRnFXYbh5T8Wb4ig9ao=; b=ITG3RDRUk+0hg1hHwWkZvo39E5WxT5cOEjVUucArIUctl9Bsdb1LvKWFBwxWva4DpHRV4bjsn0zB42XV42g0Bmro2AcC0TxkBDXOhGAWJjj4iAAQ+A0wBKlr0Argg38m5F8e8BkBJkvnX0VT38eZOzNCPKHvnaHahDFic50fspg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) by PAWPR04MB10008.eurprd04.prod.outlook.com (2603:10a6:102:38b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.29; Tue, 13 Jun 2023 09:14:56 +0000 Received: from AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::79f2:2888:dbd7:ad6f]) by AM6PR04MB6341.eurprd04.prod.outlook.com ([fe80::79f2:2888:dbd7:ad6f%7]) with mapi id 15.20.6455.039; Tue, 13 Jun 2023 09:14:56 +0000 From: Ming Qian To: mchehab@kernel.org, hverkuil-cisco@xs4all.nl Cc: shawnguo@kernel.org, robh+dt@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, xiahong.bao@nxp.com, eagle.zhou@nxp.com, tao.jiang_2@nxp.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] media: amphion: add helper function to get id name Date: Tue, 13 Jun 2023 17:14:08 +0800 Message-Id: <20230613091408.7676-1-ming.qian@nxp.com> X-Mailer: git-send-email 2.38.1 X-ClientProxiedBy: SG2P153CA0007.APCP153.PROD.OUTLOOK.COM (2603:1096::17) To AM6PR04MB6341.eurprd04.prod.outlook.com (2603:10a6:20b:d8::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB6341:EE_|PAWPR04MB10008:EE_ X-MS-Office365-Filtering-Correlation-Id: c7da34e8-1c5d-46b3-3ed9-08db6beea7ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 305ax0MzF3+u1W4hnr0qAPrn57xueagvMOCaly3p6g6yj+ojYmjpYYVYtcDPXlU/Ty9DrH7skHSaHlnmVHtHfy8+Q28OeIImbiR4NZPl5KjA9+KmmfW62adO3Y5kAwcB91r8pkxS8LCTXWZpx5MtroO7ACY+/egc3Hq6ejq9/mYnU3w07GEgBIS+UO0jZfwhQkFZaqQA5sZmLX3ONuj13/ns/RVn/2LcGRvwGYV0M7+M9wIsHOqeifls55/x7Jaz+4yiYeknSBpDJW2qrSzkjp1WKLP68WJOfAe4aTaC61U6UqRwp8FZLITNUbHtDpOQJ2wMZocURZ8hH967GfV8qIzCth/lSgZWYALI37u9M4KoW71/2ukx3U17rilkvj9MseqAt3mexgHLkSaKHUXqxBQmjCDGB5teigOkRN51Z7asIyrizbAUBG+oR7OmV1YdCyx3Hi4qFXRl0IBpqL1PKPaBYDpPcqkXkQVccyWGocGekqQT09HdyrNvh21RlHffyRu03iFVyZv2b9YMsVoY0KDVSUG32clmNlCu1EWPMzQOH6yeJ0oteLkaBSXADS5hrr7c8tpz7sfxJ7ldOkrXuXMAlXIEKVuPgrWIr1kNEFiUECoCJc5SrU3AMfqgk3C1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6341.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(376002)(366004)(39860400002)(346002)(136003)(396003)(451199021)(2616005)(83380400001)(38350700002)(36756003)(38100700002)(86362001)(478600001)(44832011)(4326008)(6666004)(6486002)(8936002)(8676002)(2906002)(5660300002)(7416002)(52116002)(66556008)(66476007)(66946007)(41300700001)(316002)(186003)(6512007)(6506007)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pMZeTyfFFYM1/2rujH0Wabf9UhNlC9y9Sfyg++i3KwkcnuhX7PHXIY+h0rEZT/DyOpDsI8GSQXJdvzjsgV75p4S4Odss1dIbWW7HSe2eshNiS1SoMIChse4p1EkfntCnT1AS1YtimRdpHHvh1b29MSZ0L/1urixcVxAa5ZezPFqdRf9eRKZbDXZie/zt/3pS6guZ39HOlMbMujdeSIRuXpMIzlWQWy5LvQVR0s74YTpYW/AB6BwMqNJ9s64eeyzzeDi47rxj0RXlXg/hlR36PcOeKzK4Gu3bxfI8Up0WXxaUoXrsWqZhAI020O2Jc+IOOhDUDKzx5K0JrnMqh+LkwU8jVMxNQfnth0Ruwz3QciiufUAV+xIM5NwC2dZ0QBXR++WI/zH0oHJ74hRXGKbysEN6aXX8tib/FVIheBM/ClGTAXki4UHFBMyfmwdSn/A6jplxyNQObbOfVZcvOxnF9Vxh/kENXARhG7zmIdlcCUBZQekTbDHf09KMDJhAC5iHa2U3OtbTP6vU08Q6j3EpisCOplPonbdo9c9Nt7shtc/s5q9vkEcmzIPy5EUz4tw97fkDnlKk/izgDqjXvpxVBkJ42Ki/qKi2PJ/EelJpzkpcq+k0/uCZJrcGmHb1u9XdgxExlt1v8ZPUFRcVF42dZXZa4ZiNFMCJJuks1Gp7GVi/flFI2OXZ6dH/xSP5d2Fag8qEugaw3BuphxK8wMeeV06fAIF3HTfvUKyLbc/gBE1nmH2Jm/EqnH5OyYrzW+MzeD9rNUA7NxZLY1BsZX2m56bk4jc/xnWWmpqeMPbFm4ClYQjV2KQCV6oD9UMsE7OZrzLHNLcVLRIFXZfRcCNEBnN+IlMYLAav975CNhs7SeO6MU7gMV0VpsMh7c43ewnGrKBc74kKs0Bpv7OiiKmP6/RnHrQ4Fvu5EODFz9tlX/bCq1JZDKrCOtISHW88i3XFxfhpgFMQCSe16w7f4I9L/64OuVs1SfztnB1jof3yhIN9LArs9xBfupUJWxLdmQ3pYio3k/dmCL2eqKpxdgu3ga/fbS2CMt6Y/AcJ69JIDMkOe3BPLvUKf+4h5Jl/AtoBoxGUP2tM7SaUmI1Bqj3S0giTDQNqfNMeCFrreWdzIAjKNJCic54QCWL2EBhz4O0tVjsZIzAKny/ZhJ3TaD3ppISoH84/HCz5c7e1aTku6bFSkK6yM/ljspoW44NHHLvyEQhiFp3fhhGwz9Emh1rpeDAfkm4Y2vhA1Up1Z3KQzj51dG1MZlmcCuquQz0J/CspxHMvg07v5c338yetj2nEpsbnbrHKL6xqqfTybyMTlMgD/8MjZ10oz2R8GWLvL8W8sjYZE3aABiUNSgtPiwHAicLarYJhtQTOodfhPM51uVrk7EZ6fw0qIz/PfSCFlui5zuP2LMRO1CtAApjMJajyEF4JLhZDI+PCpuvd1G5ZxoN23DsyZO4rRRkLVAJ0JrSPWVoSjrPanytbPef/RbwRoMqEL7ybhxjKhSWdUgOqwQFxTN+Z2AIzCEPYLEfa+emOqSMt6wnzkkvn4Up2d31jWS2knSqOVUUxrICS0ClLrHmpmcn2/6//YF4HaPdGB8T4 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7da34e8-1c5d-46b3-3ed9-08db6beea7ce X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2023 09:14:56.7377 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ITZhG/LBz9kTY/9bTr+VBz2cepdpLSOkOPrZYgW0BDKcE6EcL+NVC5yeLDq+mSx3xSFIOCxlqYn0v+8tibdqGg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB10008 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham 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?1768579205093759187?= X-GMAIL-MSGID: =?utf-8?q?1768579205093759187?= convert numbers into meaningful names, then it can improve the log readability Fixes: 9f599f351e86 ("media: amphion: add vpu core driver") Signed-off-by: Ming Qian Reviewed-by: Nicolas Dufresne --- drivers/media/platform/amphion/vdec.c | 9 +-- drivers/media/platform/amphion/vpu.h | 3 + drivers/media/platform/amphion/vpu_cmds.c | 11 ++-- drivers/media/platform/amphion/vpu_dbg.c | 6 +- drivers/media/platform/amphion/vpu_helpers.c | 61 ++++++++++++++++++++ drivers/media/platform/amphion/vpu_msgs.c | 2 +- 6 files changed, 79 insertions(+), 13 deletions(-) diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c index 56c4deea4494..60f3a73c6a8a 100644 --- a/drivers/media/platform/amphion/vdec.c +++ b/drivers/media/platform/amphion/vdec.c @@ -299,7 +299,8 @@ static int vdec_update_state(struct vpu_inst *inst, enum vpu_codec_state state, vdec->state = VPU_CODEC_STATE_DYAMIC_RESOLUTION_CHANGE; if (inst->state != pre_state) - vpu_trace(inst->dev, "[%d] %d -> %d\n", inst->id, pre_state, inst->state); + vpu_trace(inst->dev, "[%d] %s -> %s\n", inst->id, + vpu_codec_state_name(pre_state), vpu_codec_state_name(inst->state)); if (inst->state == VPU_CODEC_STATE_DYAMIC_RESOLUTION_CHANGE) vdec_handle_resolution_change(inst); @@ -1037,8 +1038,8 @@ static int vdec_response_frame(struct vpu_inst *inst, struct vb2_v4l2_buffer *vb return -EINVAL; } - dev_dbg(inst->dev, "[%d] state = %d, alloc fs %d, tag = 0x%x\n", - inst->id, inst->state, vbuf->vb2_buf.index, vdec->seq_tag); + dev_dbg(inst->dev, "[%d] state = %s, alloc fs %d, tag = 0x%x\n", + inst->id, vpu_codec_state_name(inst->state), vbuf->vb2_buf.index, vdec->seq_tag); vpu_buf = to_vpu_vb2_buffer(vbuf); memset(&info, 0, sizeof(info)); @@ -1400,7 +1401,7 @@ static void vdec_abort(struct vpu_inst *inst) struct vpu_rpc_buffer_desc desc; int ret; - vpu_trace(inst->dev, "[%d] state = %d\n", inst->id, inst->state); + vpu_trace(inst->dev, "[%d] state = %s\n", inst->id, vpu_codec_state_name(inst->state)); vdec->aborting = true; vpu_iface_add_scode(inst, SCODE_PADDING_ABORT); diff --git a/drivers/media/platform/amphion/vpu.h b/drivers/media/platform/amphion/vpu.h index 3bfe193722af..5a701f64289e 100644 --- a/drivers/media/platform/amphion/vpu.h +++ b/drivers/media/platform/amphion/vpu.h @@ -355,6 +355,9 @@ void vpu_inst_record_flow(struct vpu_inst *inst, u32 flow); int vpu_core_driver_init(void); void vpu_core_driver_exit(void); +const char *vpu_id_name(u32 id); +const char *vpu_codec_state_name(enum vpu_codec_state state); + extern bool debug; #define vpu_trace(dev, fmt, arg...) \ do { \ diff --git a/drivers/media/platform/amphion/vpu_cmds.c b/drivers/media/platform/amphion/vpu_cmds.c index fa581ba6bab2..647d94554fb5 100644 --- a/drivers/media/platform/amphion/vpu_cmds.c +++ b/drivers/media/platform/amphion/vpu_cmds.c @@ -98,7 +98,7 @@ static struct vpu_cmd_t *vpu_alloc_cmd(struct vpu_inst *inst, u32 id, void *data cmd->id = id; ret = vpu_iface_pack_cmd(inst->core, cmd->pkt, inst->id, id, data); if (ret) { - dev_err(inst->dev, "iface pack cmd(%d) fail\n", id); + dev_err(inst->dev, "iface pack cmd %s fail\n", vpu_id_name(id)); vfree(cmd->pkt); vfree(cmd); return NULL; @@ -125,14 +125,14 @@ static int vpu_session_process_cmd(struct vpu_inst *inst, struct vpu_cmd_t *cmd) { int ret; - dev_dbg(inst->dev, "[%d]send cmd(0x%x)\n", inst->id, cmd->id); + dev_dbg(inst->dev, "[%d]send cmd %s\n", inst->id, vpu_id_name(cmd->id)); vpu_iface_pre_send_cmd(inst); ret = vpu_cmd_send(inst->core, cmd->pkt); if (!ret) { vpu_iface_post_send_cmd(inst); vpu_inst_record_flow(inst, cmd->id); } else { - dev_err(inst->dev, "[%d] iface send cmd(0x%x) fail\n", inst->id, cmd->id); + dev_err(inst->dev, "[%d] iface send cmd %s fail\n", inst->id, vpu_id_name(cmd->id)); } return ret; @@ -149,7 +149,8 @@ static void vpu_process_cmd_request(struct vpu_inst *inst) list_for_each_entry_safe(cmd, tmp, &inst->cmd_q, list) { list_del_init(&cmd->list); if (vpu_session_process_cmd(inst, cmd)) - dev_err(inst->dev, "[%d] process cmd(%d) fail\n", inst->id, cmd->id); + dev_err(inst->dev, "[%d] process cmd %s fail\n", + inst->id, vpu_id_name(cmd->id)); if (cmd->request) { inst->pending = (void *)cmd; break; @@ -339,7 +340,7 @@ static int vpu_session_send_cmd(struct vpu_inst *inst, u32 id, void *data) exit: if (ret) - dev_err(inst->dev, "[%d] send cmd(0x%x) fail\n", inst->id, id); + dev_err(inst->dev, "[%d] send cmd %s fail\n", inst->id, vpu_id_name(id)); return ret; } diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platform/amphion/vpu_dbg.c index 44b830ae01d8..adc523b95061 100644 --- a/drivers/media/platform/amphion/vpu_dbg.c +++ b/drivers/media/platform/amphion/vpu_dbg.c @@ -67,7 +67,7 @@ static int vpu_dbg_instance(struct seq_file *s, void *data) num = scnprintf(str, sizeof(str), "tgig = %d,pid = %d\n", inst->tgid, inst->pid); if (seq_write(s, str, num)) return 0; - num = scnprintf(str, sizeof(str), "state = %d\n", inst->state); + num = scnprintf(str, sizeof(str), "state = %s\n", vpu_codec_state_name(inst->state)); if (seq_write(s, str, num)) return 0; num = scnprintf(str, sizeof(str), @@ -188,9 +188,9 @@ static int vpu_dbg_instance(struct seq_file *s, void *data) if (!inst->flows[idx]) continue; - num = scnprintf(str, sizeof(str), "\t[%s]0x%x\n", + num = scnprintf(str, sizeof(str), "\t[%s] %s\n", inst->flows[idx] >= VPU_MSG_ID_NOOP ? "M" : "C", - inst->flows[idx]); + vpu_id_name(inst->flows[idx])); if (seq_write(s, str, num)) { mutex_unlock(&inst->core->cmd_lock); return 0; diff --git a/drivers/media/platform/amphion/vpu_helpers.c b/drivers/media/platform/amphion/vpu_helpers.c index 019c77e84514..af3b336e5dc3 100644 --- a/drivers/media/platform/amphion/vpu_helpers.c +++ b/drivers/media/platform/amphion/vpu_helpers.c @@ -11,6 +11,7 @@ #include #include #include "vpu.h" +#include "vpu_defs.h" #include "vpu_core.h" #include "vpu_rpc.h" #include "vpu_helpers.h" @@ -447,3 +448,63 @@ int vpu_find_src_by_dst(struct vpu_pair *pairs, u32 cnt, u32 dst) return -EINVAL; } + +const char *vpu_id_name(u32 id) +{ + switch (id) { + case VPU_CMD_ID_NOOP: return "noop"; + case VPU_CMD_ID_CONFIGURE_CODEC: return "configure codec"; + case VPU_CMD_ID_START: return "start"; + case VPU_CMD_ID_STOP: return "stop"; + case VPU_CMD_ID_ABORT: return "abort"; + case VPU_CMD_ID_RST_BUF: return "reset buf"; + case VPU_CMD_ID_SNAPSHOT: return "snapshot"; + case VPU_CMD_ID_FIRM_RESET: return "reset firmware"; + case VPU_CMD_ID_UPDATE_PARAMETER: return "update parameter"; + case VPU_CMD_ID_FRAME_ENCODE: return "encode frame"; + case VPU_CMD_ID_SKIP: return "skip"; + case VPU_CMD_ID_FS_ALLOC: return "alloc fb"; + case VPU_CMD_ID_FS_RELEASE: return "release fb"; + case VPU_CMD_ID_TIMESTAMP: return "timestamp"; + case VPU_CMD_ID_DEBUG: return "debug"; + case VPU_MSG_ID_RESET_DONE: return "reset done"; + case VPU_MSG_ID_START_DONE: return "start done"; + case VPU_MSG_ID_STOP_DONE: return "stop done"; + case VPU_MSG_ID_ABORT_DONE: return "abort done"; + case VPU_MSG_ID_BUF_RST: return "buf reset done"; + case VPU_MSG_ID_MEM_REQUEST: return "mem request"; + case VPU_MSG_ID_PARAM_UPD_DONE: return "param upd done"; + case VPU_MSG_ID_FRAME_INPUT_DONE: return "frame input done"; + case VPU_MSG_ID_ENC_DONE: return "encode done"; + case VPU_MSG_ID_DEC_DONE: return "frame display"; + case VPU_MSG_ID_FRAME_REQ: return "fb request"; + case VPU_MSG_ID_FRAME_RELEASE: return "fb release"; + case VPU_MSG_ID_SEQ_HDR_FOUND: return "seq hdr found"; + case VPU_MSG_ID_RES_CHANGE: return "resolution change"; + case VPU_MSG_ID_PIC_HDR_FOUND: return "pic hdr found"; + case VPU_MSG_ID_PIC_DECODED: return "picture decoded"; + case VPU_MSG_ID_PIC_EOS: return "eos"; + case VPU_MSG_ID_FIFO_LOW: return "fifo low"; + case VPU_MSG_ID_BS_ERROR: return "bs error"; + case VPU_MSG_ID_UNSUPPORTED: return "unsupported"; + case VPU_MSG_ID_FIRMWARE_XCPT: return "exception"; + case VPU_MSG_ID_PIC_SKIPPED: return "skipped"; + } + return ""; +} + +const char *vpu_codec_state_name(enum vpu_codec_state state) +{ + switch (state) { + case VPU_CODEC_STATE_DEINIT: return "initialization"; + case VPU_CODEC_STATE_CONFIGURED: return "configured"; + case VPU_CODEC_STATE_START: return "start"; + case VPU_CODEC_STATE_STARTED: return "started"; + case VPU_CODEC_STATE_ACTIVE: return "active"; + case VPU_CODEC_STATE_SEEK: return "seek"; + case VPU_CODEC_STATE_STOP: return "stop"; + case VPU_CODEC_STATE_DRAIN: return "drain"; + case VPU_CODEC_STATE_DYAMIC_RESOLUTION_CHANGE: return "resolution change"; + } + return ""; +} diff --git a/drivers/media/platform/amphion/vpu_msgs.c b/drivers/media/platform/amphion/vpu_msgs.c index 92672a802b49..f9eb488d1b5e 100644 --- a/drivers/media/platform/amphion/vpu_msgs.c +++ b/drivers/media/platform/amphion/vpu_msgs.c @@ -210,7 +210,7 @@ static int vpu_session_handle_msg(struct vpu_inst *inst, struct vpu_rpc_event *m return -EINVAL; msg_id = ret; - dev_dbg(inst->dev, "[%d] receive event(0x%x)\n", inst->id, msg_id); + dev_dbg(inst->dev, "[%d] receive event(%s)\n", inst->id, vpu_id_name(msg_id)); for (i = 0; i < ARRAY_SIZE(handlers); i++) { if (handlers[i].id == msg_id) {