From patchwork Fri Jul 1 10:52:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 12903161 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 104CCCCA47F for ; Fri, 1 Jul 2022 10:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zRI9Gh7/YtjgP8mVgApQyA3GHi/707s2OxZOLEZ9+C4=; b=HvGhNYr14MQurp7DAhekA7lXCE 2MYYH13zqPt+hCsK4WhaMBjIXliyTG55MvuAsFaLmdXfsleNPEf/RUlf3CoRziWcK6QZTe846Qo6E 2qq87D/F43Pm40GvXyNkVQ15+jpEcGEyFg9aiNVAfaygy0h1uTR98AcaTS/VDAq9RDi+yYquRbFjm 0qqFC+MOBb81o9LuEuZEZBKJAKAnwCbjQGB9x7cJmvq8QUFN9Ub6jEWJkdIMZsqmcTUWHNsqgVjkr mSI7CDklzhVZUmWED4pcyr7Z9Q98/xuGlcdqT4rWUQ6mLbelPX17Ng+aP8ER42k7VWdoQYuVp5Jtj al0Lnwtw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EGv-004Csa-LG; Fri, 01 Jul 2022 10:53:13 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EGr-004Cpe-8o for linux-mediatek@lists.infradead.org; Fri, 01 Jul 2022 10:53:12 +0000 Received: by mail-pl1-x62a.google.com with SMTP id q18so2005273pld.13 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=hl8odvazKU3r8CXzIH3jsjLi5SVHJadRdgfs5vpK8kSGnLYXjFVaIBQEcg3B7A/Rpo AMuZK+YPLzg/w22IeF1pxCNlfAR40FITdOhrjbiVAhiIeMV+hG+2xXzWtACPwtsZy9VV PDM4F2TbMr+lK/OkyuWQu6D10DH2QKaPCh1v7jZgJfV8qmmjCoHDvVqetaD6Ma5eYNd0 zyMuZZn94YLlGtzn0nw/OBGQVWWnmyo6j91FbDFjRUJJQpJE0hHmAzgY8cFspYHG4py0 3NULgTkJ9+yAvfKZFxrj9CnZtA3cFMj9nt/U3xmfr18bH+C6BVBNT1fzEd/EaHHv76Eb HV9w== X-Gm-Message-State: AJIora9Yg8x3D7zZRBM5WTHwdbBsFXUPMZeP1sn1AgWD0EHHQ1D0Qmgp dOMgXkHh+OeZEnJgnQLQVUkGRg== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_035309_396856_0BA54C72 X-CRM114-Status: GOOD ( 13.10 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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 capability 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/drivers/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 = fh_to_ctx(priv); + struct device *dev = &ctx->dev->plat_dev->dev; int platform_name = mtk_vcodec_dec_get_chip_name(priv); - 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", platform_name); From patchwork Fri Jul 1 10:52:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 12903162 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F19BFC43334 for ; Fri, 1 Jul 2022 10:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=I4MDjjO8BzInQr5TM6t/zvnDVVooHxE4yuX82IM60po=; b=K1IvOAsHa9C1KizC4xWkmTtNbN x8+kqXR/wr28pU3SyYSmb+5mP4HolSReaJ3GF3/ZqjHN+hvFa8nrR+bxRuWgZ0o6OScSiUrPvfYpQ FdcCJXYGgGL9dw4UOwfXv5PndtQVQFnBTIHoli5Q6eqmJkFAr015APcgSbhzQ/wxCnDpD7w5nwetR pjWHTr1jKHMJPPoVXiIlP63lWoSOrD6ssqhxzNGcNpHsg/prnHHbPnAGex8G8Qy4GGQbHAcmmoag8 2bXpHCCuKdaXu2OE6At0vZ4IHofW83KWPYV9+D96UT/gtJm7SxQNy4UGeSZUMpPpsFYimagdcaYqj 6DrVyz3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EH0-004CwD-Ci; Fri, 01 Jul 2022 10:53:18 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EGv-004Cqb-G0 for linux-mediatek@lists.infradead.org; Fri, 01 Jul 2022 10:53:14 +0000 Received: by mail-pj1-x1033.google.com with SMTP id c6-20020a17090abf0600b001eee794a478so6066894pjs.1 for ; Fri, 01 Jul 2022 03:53:10 -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=mfjAjKS8/UdSkjzhgh8pcJDhpSt+dfhBTL1VFYPE1y9PzLnJh7/I3y3zPOJ2qqoOt5 YbvWe0HeNYqqM+6ijriN3Pjmw9m9Cbl7uJIW5FDnq8pYdK/PGYj6T+WzIKjK7xl+ZMs4 Mb0yankZCcd6RQNoKaf3sUTyVVJF6jh/rrf08DLXS5v1NQqWXn786/vgJ/PofMuCUTl/ vIuXcl4mN1reTXtvbUsVR5kPxa9fyQ6pfFWhw4U+Y3/kqFoCFqrtZ/bDxZMB7JiUZJe7 b+ngGr+VkA7OHl8at/6RQT9L1sRp3QJEgBgFzkrxWq8stTxXUpEykp5AAei5n+NImOJU Kt8g== X-Gm-Message-State: AJIora+oSDHIhZ5pp/PgQ44nk6zmpt03F8Aa62ogCDxc9zU0kVB5cE/8 Dn/LRH0GPnklntyXyJ7cuRm0jA== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_035313_568033_1619256E X-CRM114-Status: GOOD ( 12.96 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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 capability 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/drivers/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 = mtk_vcodec_dec_get_chip_name(priv); 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_name); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-dec", platform_name); return 0; From patchwork Fri Jul 1 10:52:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 12903163 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7AC0FC433EF for ; Fri, 1 Jul 2022 10:53:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tNyMQ++pzshlrdbVzN0h4wlM/fIXVOempzIZ1eG6MMs=; b=NIE8cDQW/nsYqLTRlJ+qTBTdlq x8iyKtATpum+k6xaQf5lmf4YN+KzPo1V1QNJN5dacl9EH7EAdwhgLE3dlLPwNN6YLIJ5Z00ZAlBhS cI51l2IZpdTxdCWJA/lzA2jFZ6m/2OsMRQoo4WIeABAiEKON0H1cf5Xxy7CFul31nF3GReVCJ1Gnp lLJ1K6AzzJnbTXebT7XMRxWSliMC+Kub+h0vG/31ml1nXAo+ObMHJwVQBfwZFCcLSrEdBDmpa6Jx4 afTct3tIPTEMw0u5HEHDiU63cfDJhYxAkjfS8/3wj63HpPtpgJBKXxUpYoBQH3X7eVL+/UeQJXa05 txHEIIPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EH7-004D1s-GK; Fri, 01 Jul 2022 10:53:25 +0000 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EGv-004Crn-Uf for linux-mediatek@lists.infradead.org; Fri, 01 Jul 2022 10:53:15 +0000 Received: by mail-pl1-x62e.google.com with SMTP id o18so2051811plg.2 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=rKjZb38rgSufY+iK8suYqVIBPxi78TIMJUfSj4SFdgp3fWB8Sb6XhzWD+3bdNOz5IG ieVCWEzaDrYl6Rxts1nxFXhYSycWLZqRVAbn+PrYWpj1OfYN2V1/WIjoBUYjPHYJM43a 1IyoGm+noqcTL8chmGoiREEfH17qIe3OfinwGjKlXtN/XPDooFrsIhxKC9cEMGqSIt1P HH8X7Z3MTndcLXADi4gRSyh5Jfwd0P57y/xgQtjO4bI6jvqdhzykyG0gkj5sdPEXewrO pNBcyxX8uSo2PRQ9oMv0CRlD10SeJkTSiAmuuMLeLZjyXaGm8sej062oQe1IZjeMXJnP hOLA== X-Gm-Message-State: AJIora+3NuilPE2i64Yy5f1UrfJQ3kUpNkKC4qDFr6sH13W4eaMkHBql k+Bf/hyWn09u3IvBeCpwF4RyjZyV74yttw== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_035314_017775_28FC4BD8 X-CRM114-Status: GOOD ( 11.10 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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/drivers/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, strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); snprintf(cap->card, sizeof(cap->card), "MT%d video decoder", platform_name); - snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-dec", platform_name); return 0; } From patchwork Fri Jul 1 10:52:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 12903164 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BEB1EC43334 for ; Fri, 1 Jul 2022 10:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ljX4VHxLEnJH6CxFcKPCMc5PmhMdDAHdoJtj9hiur4A=; b=GcKQQczi8mJAgjGYMSVE11RnC1 JVxO+7eFKuuDxPdKUZ9lK3WAQvlVOVCitiZxnGa4wku1TBE3UEyFaTz2xIfmYFhTzMhdF00cm6Lj+ tc7KOJOoR8bZ8+TW3OIIEbXEHp9ZTIjPHi85KAnWyxzNtLp3O6dfC6pbu8LCrqxQug8JgjXUXg49p y3I0yv7TCl36NQEeM81JvozbzlFG68Xt36bMIPXkk0jpk6+QtQmFFe1lCSI3oTBeTj7KVoh3CoWTc YPwwWcs858uEd91U299FshMaQ6GHX8TknZ/2q2Eb9xSjbivsaUz29JVMNZSh2/umsNuYgOID0kcvX HiyEo3UQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EHA-004D3F-B4; Fri, 01 Jul 2022 10:53:28 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EH0-004CtN-Q5 for linux-mediatek@lists.infradead.org; Fri, 01 Jul 2022 10:53:21 +0000 Received: by mail-pl1-x635.google.com with SMTP id b2so2029874plx.7 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=3uBywvgoLpQzpeXXPlvrM67JcpAd1TRuHcXqTGphBe2Rg5ljK6UPglRZpL6jiTAk8T Lyo/3vJsu5MSm4G9y9R62iuWVRlPBKF2YSJriXDDpzClBvPr08KtlOEuho5xo6TYEXS9 miBywPUBQRuyNwOyU9gTKbqDszs+/3Ri9Wkug3Yon5uSzhOT8q85LVrq6DuUYM5+FM9z ELVmuS7HjvyYO0s961bsdA2vrrZB7dd9CK5aEuKnQGqGQSksjqKTast2oJIzoRlbpnjm 9yJZlYsDvkEk0bUSgmFaAXiJ04qgTUo4m9023ihKrgxRV/LioKjkxnOhCdoyOZQ8ixew ty7A== X-Gm-Message-State: AJIora/pjHjq9TcM1DKzEmOuj+GvYR1EpgCUuZuP95EKdfFL2OGG739X buUMvOcH0CEdZlgI2Dl1K761gw== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_035318_911255_EE20D578 X-CRM114-Status: GOOD ( 13.05 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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 capability 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/drivers/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" #define MTK_VCODEC_MAX_PLANES 3 #define MTK_V4L2_BENCHMARK 0 diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/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 = fh_to_ctx(priv); + struct device *dev = &ctx->dev->plat_dev->dev; int platform_name = mtk_vcodec_enc_get_chip_name(priv); - 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", platform_name); + strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card)); return 0; } From patchwork Fri Jul 1 10:52:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 12903165 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A7583C433EF for ; Fri, 1 Jul 2022 10:53:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=NOBWwqnNtZ38dDVIIzLfaocfRAGUVvDLs14+wanTT94=; b=XSYyjq2ylXf8T5hPGUN+SavrsK qGG5Z8BaFG5VY4hDjr4vKpcANQU4/9vxtBL4YlmEZgML83QyOlqIy7JFJtY4etBkEm1UOuFqHPNLW sYKAxKfQu3niFu946HCOAPRdwVcLM0SEfuJ6OoKr6pnm8BB1NdwSo+2hfNLAFUsA0rOxVDWiFEsAs fktB0OeuBG6xiMPfrF6RvnskEfwTpfkaZ14GEhFDQTrEKtESZ9Rp9thxtBhwOPG4GaD23CZIbTK/c P4avHFR5jBwWB6jHE+1CCaa5pRt7+oXtmQ2V6/gqtetjFhdhd0Ufbv+purIkcE/Gmz8uzNE5ATDfm g16W/BFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EHB-004D4P-Lc; Fri, 01 Jul 2022 10:53:29 +0000 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EH0-004CvI-VE for linux-mediatek@lists.infradead.org; Fri, 01 Jul 2022 10:53:21 +0000 Received: by mail-pj1-x102f.google.com with SMTP id l2so2283216pjf.1 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=g91GkccWBI6dvTsqRjl5NnSNX5GYM4bkaahpaDfeSfonyTDLz1koKk/0/PDGnsmI8v FdGekqbil50gC8Kwqjd1CCO6BNNxOAntpfiW9GFBNpKj/L4Q4ufWnDtYzia1zdnz2W7O tmGq7tW6j3LbBQ/Y1koqrdqt7VyJt+wsxNNeX3PECo2m8mc+KwrhIamktPYjLo5nOPiI 6Onodx+2W1l3nOfxe5NtaSxZLzpbDGAnRa4Xka2BO4ZSjmIht3ylqModmUD68Yd8hjaE cNqzUVJV7wm1jj9Vind1kjbIkS0cvGL0ztAnPhfG+eXZ56mAY9QBB/kMgHUOVO8UTk1y dGVg== X-Gm-Message-State: AJIora9DTRbA7fTx8Wdz6IQiP4vHSu8+zNK9hlZ6Vh7kl5Kb9c1HeSXq Nz5CSfPgokbSmcrwxDHl+OSrIA== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_035319_028162_C281F14F X-CRM114-Status: GOOD ( 12.71 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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 capability 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/drivers/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, strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-enc", platform_name); - strscpy(cap->card, MTK_PLATFORM_STR, sizeof(cap->card)); + snprintf(cap->card, sizeof(cap->card), "MT%d video encoder", platform_name); return 0; } From patchwork Fri Jul 1 10:52:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 12903166 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F31FECCA479 for ; Fri, 1 Jul 2022 10:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LAb8BhaEnoy6g4TUthkAckgbU5LqWiMd2MpRJwBJ244=; b=grYdipAHMaYQkM94ZjenjUAes7 M0OHERFKfekv8U0SkQA3It8gSodPp0F1pSxNzMg8N9dM09iiLimHs5kHwfnIRIEvhGv7QDsRtC7Ok vzjURokr/z2eoI+jUjwJKTxyaM80sDp8fqePYCoy2T666fZ2a2MxPGAdBAXanSLzo5Z43srNimvwa lJE22TsmelLCPkYRt0ylhMyKnOVQ6omrfdKmpU7ji+IBcA51zaYR8WkLtX9YEol3qBArvCZIom6Sm tZcLiIwao7BKy18o8kaOs3enA8Fe18tp1BRRea+FQKV6YQw3Ga0WgnBG6q3xvh+3GlnAAxXvjOTU+ L3F/fxcA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EHC-004D5H-Ti; Fri, 01 Jul 2022 10:53:30 +0000 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o7EH3-004CxI-Vq for linux-mediatek@lists.infradead.org; Fri, 01 Jul 2022 10:53:23 +0000 Received: by mail-pj1-x1031.google.com with SMTP id g20-20020a17090a579400b001ed52939d72so2305318pji.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=7KUofhW7DMav9LXzTS54NU1gellBIM60auahIR24viUMaLyJq6N1d09KvExsk6kbYm SWWxNd1WMUqzJ8ha8P1SXJWlBmQgzN0Za96ZLIGL9WTn4mN+dcj4b/+R32/6i8vmVv4e ejXWlbIKffr7Qv4gEmeMkLPXRsLKVnVgit3z1oHtzF+sEUk1NIXvomUf5YPwhj6ElQaf 1ifszPrxhZpB8Qu982hlYhItGE7+3mQH/lDWp00sgH07I3FiRkeFjZxMAXL6nLHzKZir YMt2MvBz4mLwII0Ii62Tz+bio/87xK+9vvydscbVS3ySqs+41OoPw5AyFeR/S9TNIQZo eSHQ== X-Gm-Message-State: AJIora8siUXDuMhWFZbgxBmRTFF0UjukVNnxKMqGpgQLYkqrZ0VIFNWm 1GK2g0v78QBFNVh32pYpXvvYMg== 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220701_035322_098985_C4F7E702 X-CRM114-Status: GOOD ( 10.50 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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/drivers/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 = mtk_vcodec_enc_get_chip_name(priv); strscpy(cap->driver, dev->driver->name, sizeof(cap->driver)); - snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:mt%d-enc", platform_name); snprintf(cap->card, sizeof(cap->card), "MT%d video encoder", platform_name); return 0;