From patchwork Thu Sep 14 13:33:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 139647 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp440794vqi; Thu, 14 Sep 2023 08:44:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIe+Scs9WzDVIpG5ugw7Lg4W806FG4GbTBUdlTraNnQdJ+Z88eEl4W8jBC/Lp29f2kkpmu X-Received: by 2002:a92:d986:0:b0:349:4e1f:e9a0 with SMTP id r6-20020a92d986000000b003494e1fe9a0mr5529971iln.2.1694706240367; Thu, 14 Sep 2023 08:44:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694706240; cv=none; d=google.com; s=arc-20160816; b=or8nYKedXwtiXPapUQuTW/Dcu9sVzcPQy7F5pzuwRy2aa2AFKhJDlkp8nQGiNoR7PA tUO8Vc7ENPC7laC/jVBcNSmRVxgZUPBPbnnX3p58lELLp71f/WSVGVmU6J8EzQeLrYVi QLuQbU4DkWiQOEpPhKAZXaMoodSVbG2AnO5C/ZtjD1Stb6TQed1EpGQMzzrI+qtsRdaq WhASpQlPTIHllRMqJZi6pwG0Kw9jjxV215IXDVgiXWI/rH6WG+PkXmmR7SnbTCpjOl0V fM9EJxva95iYh6fJswYDS5WNvM0gMce35qcHvjWzNTEd+19Py9vfkzQn/VDblKFksRdO ArpQ== 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=jV6i3xIP4hGxH8EXvLuds7UKlCHHz8u2pXx32VH8m+k=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=xRmXI+LRvHBh9dxLQPRnTQQp5hN3jZpATbEw/BJW6yzrhjjlsq09ReQCEuwiUXYTDz WIsMuwo9Pq2LTj0x4v3SDJLK/8Roo0Q6ky5BfzqD/SAM+HM6B5JxmarNeBcI/nG2WsiU PlOU7tCQYuiz6Vjn+Id5jZSs956HqSC7Xp8ljJsjStenqDH5eXQjQHDliwNwq9zpKnhY BoJwNIU/1Aq4PsiclAzbPJX6sCp5p5Lua1UjRmEWoys081nke5OzHb4XMR+EFVjGHrK0 YvSZnAgHpcjN1JhtA9PULw0F8h4RKReuDgr7i30Ax/ucS4lyWX1OkTvV5CfY/tbFH+Be 2vZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=HpCcDjwI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id ca20-20020a056a02069400b0055be9526b7fsi1993849pgb.416.2023.09.14.08.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 08:44:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=HpCcDjwI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 6767A8705EB3; Thu, 14 Sep 2023 06:35:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239864AbjINNey (ORCPT + 35 others); Thu, 14 Sep 2023 09:34:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239296AbjINNeI (ORCPT ); Thu, 14 Sep 2023 09:34:08 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 667ED212C; Thu, 14 Sep 2023 06:33:48 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:36f2:37bd:ccbb:373f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by madras.collabora.co.uk (Postfix) with ESMTPSA id C8FBF660737E; Thu, 14 Sep 2023 14:33:46 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694698427; bh=cxYwkj/F6kj42Kfzns0GGyq/E2dEjF9Je+84qllCmIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HpCcDjwIzbu/CFpkbHzElKPkqKLgrYNOoIw0sHPR+JiGA/xYLs71WQOC1eJ1pPVFx Ae20c+bd06EakvdwkNEm0rciFoLMRdX7qE9vKLHHhtAXhN3zERt8K0oJZU1CD9RKwM R5EaqiY4AefrXlaYthIIS9w4VWVAI8g7GuNGLM6/b4bwQ1Pb/mh0cyt8BqvD03WE7A Xdoyfmq+KrpIZ2LyYgdW6M95sa6/tklcHf2ugKxMG9jzqKxIjiXgMJAso4EbnBKlvf 4y3vTKB1f8NsRAdNKLMucjH0GX1cJazDjz8jCRbaEDTMKdar2s0FQVIZmn+YEhcidV yjpJz2EwdszbQ== From: Benjamin Gaignard To: mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, ming.qian@nxp.com, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v7 30/49] media: mediatek: vcodec: Stop direct calls to queue num_buffers field Date: Thu, 14 Sep 2023 15:33:04 +0200 Message-Id: <20230914133323.198857-31-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914133323.198857-1-benjamin.gaignard@collabora.com> References: <20230914133323.198857-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 14 Sep 2023 06:35:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777028290566922041 X-GMAIL-MSGID: 1777028290566922041 Use vb2_get_num_buffers() to avoid using queue num_buffer field directly. Signed-off-by: Benjamin Gaignard --- .../platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 2 +- drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c index 3d2ae0e1b5b6..a04003d20b1d 100644 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c @@ -1695,7 +1695,7 @@ static int vdec_vp9_slice_setup_core_buffer(struct vdec_vp9_slice_instance *inst return -EINVAL; /* update internal buffer's width/height */ - for (i = 0; i < vq->num_buffers; i++) { + for (i = 0; i < VB2_MAX_FRAME; i++) { if (vb == vb2_get_buffer(vq, i)) { instance->dpb[i].width = w; instance->dpb[i].height = h; diff --git a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c index 04948d3eb011..ff183c9142a3 100644 --- a/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +++ b/drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c @@ -923,7 +923,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count) mtk_v4l2_venc_err(ctx, "pm_runtime_put fail %d", pm_ret); err_start_stream: - for (i = 0; i < q->num_buffers; ++i) { + for (i = 0; i < q->max_allowed_buffers; ++i) { struct vb2_buffer *buf = vb2_get_buffer(q, i); /*