From nobody Sat Sep 21 23:05:04 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 015FFC433EF for ; Fri, 1 Jul 2022 10:53:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235693AbiGAKxP (ORCPT ); Fri, 1 Jul 2022 06:53:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232764AbiGAKxJ (ORCPT ); Fri, 1 Jul 2022 06:53:09 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC2C1B94 for ; Fri, 1 Jul 2022 03:53:07 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id m14-20020a17090a668e00b001ee6ece8368so6040507pjj.3 for ; Fri, 01 Jul 2022 03:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zRI9Gh7/YtjgP8mVgApQyA3GHi/707s2OxZOLEZ9+C4=; b=Hs8XspyQYDCsbTiyxekYNXorFxxz/uNUUV1G6tU7K0S9W/6puaw0ZMpKUGGZs4Tatk hA/iAbm6BPVSQRsQDD02OXTxKoQdFyHteMx9SVYTsFeBrHECss4HdVqLNMsSVkVIWyqy pEuFr4+J80MSXT0OqwAO8+fXVkbGwYjx4fhP0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zRI9Gh7/YtjgP8mVgApQyA3GHi/707s2OxZOLEZ9+C4=; b=IgmMawEuMSPRKILcd1GVZtWQGgPOK4AfmkHCXm1KOvnSuOQN1aMBW5DVSKk+qgVmbs 2/XOp7UfkAJfq9hfQj+BvRGAKr0fqjLu4QLnuEMzZiFLHFvhEQB/6udNSlJrVwhD9NUA tUTu5/3WAjNlQjfvFerquFJ3VhhwQkzxuO/KlpY4YOUdK3O9kQbXv2H8csA0WPql+JXV Md/1AF1atj5UaVDDoRn07LSYvyrzZpTGfZWB7cX8WF7erG8AfVms1BYoAE3GbXvJZihQ qh45iKFe88iuN9Yox7+5LqJ/8EgAQkmxPGbr36djPzNCzp/bTm+wAEe2ftI2SEZUbOcc UhWA== X-Gm-Message-State: AJIora/p/f6ZbzRkSGDw/R8hFIriJQlympPLfmKiXmb9mhVnDPWh8Udw YnISGIG/v/9QYej8LqIhjwsNhg== X-Google-Smtp-Source: AGRyM1thrJAL4fMosshrrxIa9gN4QIMY/Q1Zq8NQRWgztOQpLfQiSsViCjvDYvLI4NRK+Rca0AtsbA== X-Received: by 2002:a17:90a:bc84:b0:1ec:81f4:f86f with SMTP id x4-20020a17090abc8400b001ec81f4f86fmr17714158pjr.29.1656672787210; Fri, 01 Jul 2022 03:53:07 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:59bf:8b47:50a0:b04f]) by smtp.gmail.com with ESMTPSA id j2-20020a170902758200b0016a058b7547sm14906670pll.294.2022.07.01.03.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 03:53:06 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: AngeloGioacchino Del Regno , Nicolas Dufresne , Chen-Yu Tsai , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger Subject: [PATCH 1/6] media: mediatek: vcodec: Revert driver name change in decoder capabilities Date: Fri, 1 Jul 2022 18:52:32 +0800 Message-Id: <20220701105237.932332-2-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220701105237.932332-1-wenst@chromium.org> References: <20220701105237.932332-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This partially reverts commit a8a7a278c56ad3b4ddd4db9a960e0537d032b0b3. This recent change caused ChromeOS's decoder to no longer function. This is due to ChromeOS using the driver name field to match the video device with its accompanying media device. After the change, they no longer matched. The driver name field should contain the actual driver name, not some otherwise unused string macro from the driver. To make this clear, copy the name from the driver's name field. Fixes: a8a7a278c56a ("media: mediatek: vcodec: Change decoder v4l2 capabili= ty value") Signed-off-by: Chen-Yu Tsai --- drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index 5d6fdf18c3a6..e7ea632a3f94 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -243,9 +243,11 @@ static int mtk_vcodec_dec_get_chip_name(void *priv) static int vidioc_vdec_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { + struct mtk_vcodec_ctx *ctx =3D fh_to_ctx(priv); + struct device *dev =3D &ctx->dev->plat_dev->dev; int platform_name =3D mtk_vcodec_dec_get_chip_name(priv); =20 - strscpy(cap->driver, MTK_VCODEC_DRV_NAME, sizeof(cap->driver)); + strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); strscpy(cap->card, MTK_VCODEC_DEC_NAME, sizeof(cap->card)); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-dec", platf= orm_name); =20 --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 23:05:04 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EA74C43334 for ; Fri, 1 Jul 2022 10:53:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236773AbiGAKxT (ORCPT ); Fri, 1 Jul 2022 06:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235792AbiGAKxL (ORCPT ); Fri, 1 Jul 2022 06:53:11 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E64DD109D for ; Fri, 1 Jul 2022 03:53:09 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id m14-20020a17090a668e00b001ee6ece8368so6040612pjj.3 for ; Fri, 01 Jul 2022 03:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I4MDjjO8BzInQr5TM6t/zvnDVVooHxE4yuX82IM60po=; b=F3QxikYl5N3X8/xOvdJRq17w3/NvwpiHC3GsLbFy1xYBZcDslcuAXxxjAOmbRx+2Da JYZdAUyxWrab4Pt6Qpwnf19kDkkaaul5CO8fcfr5Lszh9rOuNFTCFUMOJl6sDAjDDbeT FnCw6/fhwibl1Y2uUb0unP3OSQTZgVklKjUgA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I4MDjjO8BzInQr5TM6t/zvnDVVooHxE4yuX82IM60po=; b=lfiTGtjnWt86cNvPgTDWJRlTmlkfGSicCPbFjkE4+0YglzW6KLaa1N6Al8JcIfuNwQ MgKxBOWXctZQbFy/jNZYlAca88xyxD1QKWZLpsy7dHtRXPoTikjeV8iitcke1AT54GyT 1E/w1Zz8h1vQaIu24RIiZvczRZafsyrmYpGhcqgi6WNEGFPNfR4jpV+Zd1cL6nq2PmTG cbYaI9Nt4JkXNo060G93gIAO0KVMRVI9nJjN4dBfIVxgIMJwPNZjIZFjfIOnXqO+P3XA LlF1jLgmRSZVakz9fnuZ104psjC60+0VKPkfXQqZwyum2s5SaEWCZruK1pewaJjw9/nb awBA== X-Gm-Message-State: AJIora9Jdp+LwJGNHahIMUQsmvFIeGbR8e8tMPOVnBFzMF3W1XuLG8Z2 m/WzwhgVfRi/949feFhZhRVkcw== X-Google-Smtp-Source: AGRyM1vbOP8ZG1cPe69kNtF3atkiQXQM1DFxbicYf1wohz+ZtbE2UYVdKl/eREdjtV/98YWDo3SckQ== X-Received: by 2002:a17:90b:2245:b0:1ed:fef:5656 with SMTP id hk5-20020a17090b224500b001ed0fef5656mr15588223pjb.100.1656672789632; Fri, 01 Jul 2022 03:53:09 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:59bf:8b47:50a0:b04f]) by smtp.gmail.com with ESMTPSA id j2-20020a170902758200b0016a058b7547sm14906670pll.294.2022.07.01.03.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 03:53:09 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: AngeloGioacchino Del Regno , Nicolas Dufresne , Chen-Yu Tsai , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger Subject: [PATCH 2/6] media: mediatek: vcodec: Use meaningful decoder card name including chip name Date: Fri, 1 Jul 2022 18:52:33 +0800 Message-Id: <20220701105237.932332-3-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220701105237.932332-1-wenst@chromium.org> References: <20220701105237.932332-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The card name for the video decoder previously held a static platform name, that was fixed to match MT8173. This obviously doesn't make sense for newer chips. Since commit a8a7a278c56a ("media: mediatek: vcodec: Change decoder v4l2 capability value"), this field was changed to hold the driver's name, or "mtk-vcodec-dec". This doesn't make much sense either, since this still doesn't reflect what chip this is. Instead, fill in the card name with "MTxxxx video decoder" with the proper chip number. Fixes: a8a7a278c56a ("media: mediatek: vcodec: Change decoder v4l2 capabili= ty value") Signed-off-by: Chen-Yu Tsai --- drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index e7ea632a3f94..7f03dab518a4 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -248,7 +248,7 @@ static int vidioc_vdec_querycap(struct file *file, void= *priv, int platform_name =3D mtk_vcodec_dec_get_chip_name(priv); =20 strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); - strscpy(cap->card, MTK_VCODEC_DEC_NAME, sizeof(cap->card)); + snprintf(cap->card, sizeof(cap->card), "MT%d video decoder", platform_nam= e); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-dec", platf= orm_name); =20 return 0; --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 23:05:04 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEF4CCCA480 for ; Fri, 1 Jul 2022 10:53:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236196AbiGAKx1 (ORCPT ); Fri, 1 Jul 2022 06:53:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236285AbiGAKxO (ORCPT ); Fri, 1 Jul 2022 06:53:14 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71CA71E3DB for ; Fri, 1 Jul 2022 03:53:12 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id x1-20020a17090abc8100b001ec7f8a51f5so6097245pjr.0 for ; Fri, 01 Jul 2022 03:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tNyMQ++pzshlrdbVzN0h4wlM/fIXVOempzIZ1eG6MMs=; b=R0aOMwa3NeqUy4oQXlLgM0ZB88OAVKA6dYgXtMw93bB6/rs23mPNXNFWvpU0GH4/yc Sb43dmVFsJsUaxYZMZDX+10lSYlhoOSouqkueKVSNJBpG6t7qXpuQD+ZkXbvjk+mCCu5 7pJH8faeJl/CLhn1M3PPjQYQYZkmZZeoZC/cM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tNyMQ++pzshlrdbVzN0h4wlM/fIXVOempzIZ1eG6MMs=; b=IZfL0skX+rV22bYTH/LMcEdeLsqMZNyNxWBJObfPzAXKNWMHhTnvsJ0GsKiJBcmx1c Fsgqyg27wplSXJ0i1p6iDRqVnpHDHqF+rp1Hr3UFHc1CZsD0VF79oJmWUxH84BgiI8TX NB36jnR3iNMuE7iM+3HNAmXnJDdvpvqy+MM7UmIDmKQ7nu0TdmwO4WCTy3+Frzlg/dhK DFknNAQ65LcORDDQhYTrBAyU0xDTfeZ/hUi3DaZjuxOgUptIHbx2bOXYDHJwyPrj+aTp ro9UzTmFvkFeCi9Ei2ox06WHMvegGQdtLy6S9derKG2hUM6uQgk/ltXgfTaHlFhe+Msl EK+A== X-Gm-Message-State: AJIora8VMZ3lWrkog+SpkgCEtF8DGo16Acp269UOclOAygVhTZ4Qcq8y Nr8rGqO/znC24EmKqNU1q5yiUA== X-Google-Smtp-Source: AGRyM1uQQ52QyYlrWwh7GikfxSqOxRmuspOTO1vfzF1wU6i5Pt26r3/Hv3209Cj778VfSQ4D3XqAYw== X-Received: by 2002:a17:902:db11:b0:16b:9057:8007 with SMTP id m17-20020a170902db1100b0016b90578007mr18154361plx.49.1656672791912; Fri, 01 Jul 2022 03:53:11 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:59bf:8b47:50a0:b04f]) by smtp.gmail.com with ESMTPSA id j2-20020a170902758200b0016a058b7547sm14906670pll.294.2022.07.01.03.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 03:53:11 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: AngeloGioacchino Del Regno , Nicolas Dufresne , Chen-Yu Tsai , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger Subject: [PATCH 3/6] media: mediatek: vcodec: Use default bus_info for decoder capability Date: Fri, 1 Jul 2022 18:52:34 +0800 Message-Id: <20220701105237.932332-4-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220701105237.932332-1-wenst@chromium.org> References: <20220701105237.932332-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since commit f2d8b6917f3b ("media: v4l: ioctl: Set bus_info in v4l_querycap()"), the V4L2 core provides a default value for the bus_info field for platform and PCI devices. This value will match the default value for media devices added by commit cef699749f37 ("media: mc: Set bus_info in media_device_init()"). These defaults are stable and device-specific. Drop the custom capability bus_info from the mtk-vcodec decoder driver, and use the defaults. This also fixes the long standing issue where the media device used for the stateless decoder didn't have its bus_info set, and would never match its accompanying video device. Signed-off-by: Chen-Yu Tsai --- drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index 7f03dab518a4..209de1ec02e4 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -249,7 +249,6 @@ static int vidioc_vdec_querycap(struct file *file, void= *priv, =20 strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); snprintf(cap->card, sizeof(cap->card), "MT%d video decoder", platform_nam= e); - snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-dec", platf= orm_name); =20 return 0; } --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 23:05:04 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5DCAC43334 for ; Fri, 1 Jul 2022 10:53:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236556AbiGAKx3 (ORCPT ); Fri, 1 Jul 2022 06:53:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236519AbiGAKxQ (ORCPT ); Fri, 1 Jul 2022 06:53:16 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92CE31FCF4 for ; Fri, 1 Jul 2022 03:53:14 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id w1-20020a17090a6b8100b001ef26ab992bso2366155pjj.0 for ; Fri, 01 Jul 2022 03:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ljX4VHxLEnJH6CxFcKPCMc5PmhMdDAHdoJtj9hiur4A=; b=ZJnV0EvEevnHaF+V45Jfd/vZCRzSzdRu+irbWKzuk44igljTEEObfiqNT4/id84ew8 7LivaevSw+4G+bwl8ZyCUeOaZp07/xdf0+jrkbHA5CHHEgH33hoqd8rMrihn5oMudQuY aBsMIJICDEJxnECnNaZF0mmMNd3PMDVHVtKOs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ljX4VHxLEnJH6CxFcKPCMc5PmhMdDAHdoJtj9hiur4A=; b=wufoHrq+QoktKwMo7QPSezG4yaag3oONxke54+pkJuZHZrTOUjLcdP3aGy7YDzzjy/ A9HxorOM0HA6lDa7Ja43K7eodgtvhi6eKUuaPh8sHht/nmoACMHentug+elERwocNRQA nSh3UVvZoAEfIzvMMFKAg8xoiJq3ujJQUQsQl0maKDNw23uolzjiIx1uYovyTmI14jsw qmnQ9+TCau1q1pR7JXS9hlklgdsdzLzH4+Gyu1d8QlFl5pUiMwKZm2SzJlL18iQ164O9 LHw6htMRnAgstMl+QWbEQ36lAZ5puXUjrU86A6q7uHcvlERQ0S4C3ZCQJFUp7LuhkN+A 4qXg== X-Gm-Message-State: AJIora/vVUEi/RrOpE4yv3pR9Sf9rhkskZ4gEZw8j5TqgI7vtuy/e4Fd f0hJjc4NLngBLa/o97XRNbG7vYMNpf2Cew== X-Google-Smtp-Source: AGRyM1tgfY+HHtcbLfi96MHFfZj/RaDV0HbBWEhSC7TBeizj9KXzshRAWOyabhIS2FBHMwG4J9iaYg== X-Received: by 2002:a17:902:bb8f:b0:16a:80e7:e5d9 with SMTP id m15-20020a170902bb8f00b0016a80e7e5d9mr20663846pls.25.1656672794162; Fri, 01 Jul 2022 03:53:14 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:59bf:8b47:50a0:b04f]) by smtp.gmail.com with ESMTPSA id j2-20020a170902758200b0016a058b7547sm14906670pll.294.2022.07.01.03.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 03:53:13 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: AngeloGioacchino Del Regno , Nicolas Dufresne , Chen-Yu Tsai , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger Subject: [PATCH 4/6] media: mediatek: vcodec: Revert driver name change in encoder capabilities Date: Fri, 1 Jul 2022 18:52:35 +0800 Message-Id: <20220701105237.932332-5-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220701105237.932332-1-wenst@chromium.org> References: <20220701105237.932332-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This partially reverts commit fd9f8050e355d7fd1e126cd207b06c96cde7f783. The driver name field should contain the actual driver name, not some otherwise unused string macro from the driver. To make this clear, copy the name from the driver's name field. Fixes: fd9f8050e355 ("media: mediatek: vcodec: Change encoder v4l2 capabili= ty value") Signed-off-by: Chen-Yu Tsai --- drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h | 1 + drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h index 4140b4dd85bf..dc6aada882d9 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h @@ -22,6 +22,7 @@ #define MTK_VCODEC_DRV_NAME "mtk_vcodec_drv" #define MTK_VCODEC_DEC_NAME "mtk-vcodec-dec" #define MTK_VCODEC_ENC_NAME "mtk-vcodec-enc" +#define MTK_PLATFORM_STR "platform:mt8173" =20 #define MTK_VCODEC_MAX_PLANES 3 #define MTK_V4L2_BENCHMARK 0 diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c index ccc753074816..30aac54d97fa 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c @@ -232,11 +232,13 @@ static int mtk_vcodec_enc_get_chip_name(void *priv) static int vidioc_venc_querycap(struct file *file, void *priv, struct v4l2_capability *cap) { + struct mtk_vcodec_ctx *ctx =3D fh_to_ctx(priv); + struct device *dev =3D &ctx->dev->plat_dev->dev; int platform_name =3D mtk_vcodec_enc_get_chip_name(priv); =20 - strscpy(cap->driver, MTK_VCODEC_DRV_NAME, sizeof(cap->driver)); - strscpy(cap->card, MTK_VCODEC_ENC_NAME, sizeof(cap->card)); + strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-enc", platf= orm_name); + strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card)); =20 return 0; } --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 23:05:04 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B838C43334 for ; Fri, 1 Jul 2022 10:53:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235433AbiGAKxg (ORCPT ); Fri, 1 Jul 2022 06:53:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236624AbiGAKxS (ORCPT ); Fri, 1 Jul 2022 06:53:18 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0041121833 for ; Fri, 1 Jul 2022 03:53:16 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id d14so2265968pjs.3 for ; Fri, 01 Jul 2022 03:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NOBWwqnNtZ38dDVIIzLfaocfRAGUVvDLs14+wanTT94=; b=dz2Le1USQnBFFoW4ejZ1CuEd017eDMuliW3CFPa3lyAyzu0tUApEEcCNgYik7mPZ83 WGRUIz00iiW2jbnOEIdxoTZy7nqyK3vTpCsj5KGuCZ39yIdmfqMQ+HB3xw2UNMldOBef vKItRQ0qyTzxsLBAQjWSCRidIpo/X+sh85qfA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NOBWwqnNtZ38dDVIIzLfaocfRAGUVvDLs14+wanTT94=; b=Ufnqn7XYlMaf6jTyaetyLI9ZcWY/sTs11yKv2vqHSAT/+TcOSFliSNU8Ma2vD8/Qr9 X7euc1GFIkhQoAzS7iK/+sreo7PbnjTOPTxdVxtXRKV3lNyvG5u7Rjdi7dk76jpfWp5R t7vLpWzxlLu/dkvmMJjSdYR+H6n9W86e2mfLwkag9EXf/Il1b7rWVEcHTDsrCEGhW7Dn ArXM3PAUaFLanUVKTw/iI2iQVWSj0G/KQdD+ve59G47msItxwoEaRrfJSLXmP+FWDVLE ylYEZ21R27E+4xtq86g81vutXNXLhioP/bIOw4L+umqu3M2/iRg76QPaAIDDl879ZKeS vXxg== X-Gm-Message-State: AJIora8xXma0Xd+mu+AeWQQvpl6sqMb3jMBBGGQLSCdo4xsOp5EZXDFf O/n7yrvVO8vugQ7dZNPshtUXRQ== X-Google-Smtp-Source: AGRyM1uljxxSPIi8WxVPeVlccyqJ5E8bRD7D8dokyrQyOuYTXJYQrh07tl8mekQZDh2EtQzXh3M3vQ== X-Received: by 2002:a17:90b:4ac9:b0:1ec:9bd1:92ff with SMTP id mh9-20020a17090b4ac900b001ec9bd192ffmr15545625pjb.178.1656672796441; Fri, 01 Jul 2022 03:53:16 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:59bf:8b47:50a0:b04f]) by smtp.gmail.com with ESMTPSA id j2-20020a170902758200b0016a058b7547sm14906670pll.294.2022.07.01.03.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 03:53:16 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: AngeloGioacchino Del Regno , Nicolas Dufresne , Chen-Yu Tsai , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger Subject: [PATCH 5/6] media: mediatek: vcodec: Use meaningful encoder card name including chip name Date: Fri, 1 Jul 2022 18:52:36 +0800 Message-Id: <20220701105237.932332-6-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220701105237.932332-1-wenst@chromium.org> References: <20220701105237.932332-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The card name for the video encoder previously held a static platform name that was fixed to match MT8173. This obviously doesn't make sense for newer chips. Since commit fd9f8050e355 ("media: mediatek: vcodec: Change encoder v4l2 capability value"), this field was changed to hold the driver's name, or "mtk-vcodec-dec". This doesn't make much sense either, since this still doesn't reflect what chip this is. Instead, fill in the card name with "MTxxxx video encoder" with the proper chip number. Fixes: fd9f8050e355 ("media: mediatek: vcodec: Change encoder v4l2 capabili= ty value") Signed-off-by: Chen-Yu Tsai --- drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c index 30aac54d97fa..cc286e59021e 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c @@ -238,7 +238,7 @@ static int vidioc_venc_querycap(struct file *file, void= *priv, =20 strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-enc", platf= orm_name); - strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card)); + snprintf(cap->card, sizeof(cap->card), "MT%d video encoder", platform_nam= e); =20 return 0; } --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 23:05:04 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED799C433EF for ; Fri, 1 Jul 2022 10:53:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236863AbiGAKxi (ORCPT ); Fri, 1 Jul 2022 06:53:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236812AbiGAKxU (ORCPT ); Fri, 1 Jul 2022 06:53:20 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27D5E237EB for ; Fri, 1 Jul 2022 03:53:19 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id cv13so2259107pjb.4 for ; Fri, 01 Jul 2022 03:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LAb8BhaEnoy6g4TUthkAckgbU5LqWiMd2MpRJwBJ244=; b=iKv4thd0wDQP8anbuEyzEQ+Zqxa2RoLpovoXs077tea1xpsXOBelzTXGmK4y7MqftT 5BJnXPH8YNdKWTHrIlCKk2Y5qhZu1/pNfrnZsu0+Mx5vhh0AMDhG/LEBw6Yr2orVpLpS c9Rif9I0bUJFib7BjpoRdmrjmJJMel7dBcIgE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LAb8BhaEnoy6g4TUthkAckgbU5LqWiMd2MpRJwBJ244=; b=5HelQs3R4oDShmK4fZHkwZ5emqjE6xjINEZwfuj5Q9s04s+9nOgE7dCGOndHkl+KcA HcZZZCp4mllxvdsc+Q9nwMaCcYvHad2wEQEulzdAmz9hpBw//pspGMpsnwTThiSEsIn8 YCpSsbBnQJlhmLNLhpJyJ71G+nLpyKNyQd8tZF/2gdhV2Ah8puKDSkG5SlQAOgP0uVur GgtclQLBfxXsjK2bj0fTjwqK3kzrT/W/lGFwXAJJ2yuPt79u8YydnrIbeOHy6UrqOgKw RJLE9W1qk21XQc0oF88q8xykpBjiic9rhZG0QgjQItO2r2RzOzUBcDRv4UsQB1dvDh9+ Rx4w== X-Gm-Message-State: AJIora/N+NsaCnnBPmXVczPCf3ZFdQdKgHwjRtTn0E24IRk6EZgoiZIW L+SF7+7RDOX7fOqtFg1hLsyxAg== X-Google-Smtp-Source: AGRyM1v7WmL7Uss1HNkKbQMy8M5hpzoThkEh0hNwmVYgcfIBghgHA/BIAT8PEL/BvGq+Wt4ZftbeQQ== X-Received: by 2002:a17:902:9f87:b0:16a:1efc:42fe with SMTP id g7-20020a1709029f8700b0016a1efc42femr20863524plq.124.1656672798693; Fri, 01 Jul 2022 03:53:18 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:59bf:8b47:50a0:b04f]) by smtp.gmail.com with ESMTPSA id j2-20020a170902758200b0016a058b7547sm14906670pll.294.2022.07.01.03.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 03:53:18 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: AngeloGioacchino Del Regno , Nicolas Dufresne , Chen-Yu Tsai , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Matthias Brugger Subject: [PATCH 6/6] media: mediatek: vcodec: Use default bus_info for encoder capability Date: Fri, 1 Jul 2022 18:52:37 +0800 Message-Id: <20220701105237.932332-7-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220701105237.932332-1-wenst@chromium.org> References: <20220701105237.932332-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since commit f2d8b6917f3b ("media: v4l: ioctl: Set bus_info in v4l_querycap()"), the V4L2 core provides a default value for the bus_info field for platform and PCI devices. This value will match the default value for media devices added by commit cef699749f37 ("media: mc: Set bus_info in media_device_init()"). These defaults are stable and device-specific. Drop the custom capability bus_info from the mtk-vcodec encoder driver, and use the defaults. Signed-off-by: Chen-Yu Tsai --- drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c index cc286e59021e..25e816863597 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c @@ -237,7 +237,6 @@ static int vidioc_venc_querycap(struct file *file, void= *priv, int platform_name =3D mtk_vcodec_enc_get_chip_name(priv); =20 strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); - snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-enc", platf= orm_name); snprintf(cap->card, sizeof(cap->card), "MT%d video encoder", platform_nam= e); =20 return 0; --=20 2.37.0.rc0.161.g10f37bed90-goog