From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A44628A1CF; Wed, 23 Apr 2025 15:08:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420934; cv=none; b=H4Rk9fnzejMQq0Jh61TdK2l1HwNuZ3TfLInBlnAP75wyo9utZQCX3TWxXBbeBA2BkAtSuv7jo51ZFGQqy0qaP1LH/SVLx3h41ohkCBj4nEc0JKraxwQDurPeRSdBOuuSfgmU0My6KQXedHiOfgQCjaXC2YkK9rH/eBrCN6qw3yc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420934; c=relaxed/simple; bh=os7KqS6dqVWxn2JFj9MFOZa/wsas/n0WTQKfYWohwa8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=htH7iuUJFddtBqQMZaZ2bkEI/WLPQm1pGNKr1kA7PV1z4hWzeGrlyd0JZU1KQQjwKaXefakUclL8y0Ub/c6HeJ+yjcC3zVbF7oqFxhtEFP4p0gwn0sqBn3/cbl4uPuthG9uIvhWMnlV3ZM6fkyGpHtnVRkLVCgIsx8HcwGbeWhU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hscYIbPQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="hscYIbPQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0431C4CEE2; Wed, 23 Apr 2025 15:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745420934; bh=os7KqS6dqVWxn2JFj9MFOZa/wsas/n0WTQKfYWohwa8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hscYIbPQ5VQJbjrEpfvQIMhefcawQkrwD0WoM1oxTPa0ngr0gn+HNhyqH82LvcCHq 1Z4IzAk65LsUWjx3YAHriKkNo/eq7g3YH7yLtev8C8oedahZei/r1nCSIfn6F37HkQ hc/xmmGcipeZplCrwX8idl+QNVtJBowYiaMcL+LM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arnd Bergmann , Nathan Chancellor , Alexandre Courbot , Hans Verkuil Subject: [PATCH 6.6 121/393] media: mtk-vcodec: venc: avoid -Wenum-compare-conditional warning Date: Wed, 23 Apr 2025 16:40:17 +0200 Message-ID: <20250423142648.365505240@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142643.246005366@linuxfoundation.org> References: <20250423142643.246005366@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann commit 07df4f23ef3ffe6fee697cd2e03623ad27108843 upstream. This is one of three clang warnings about incompatible enum types in a conditional expression: drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c:597:29: error: conditional expression between different enumeration types ('enum scp_ipi_id' and 'enum ipi_id') [-Werror,-Wenum-compare-conditional] 597 | inst->vpu_inst.id = is_ext ? SCP_IPI_VENC_H264 : IPI_VENC_H264; | ^ ~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~ The code is correct, so just rework it to avoid the warning. Fixes: 0dc4b3286125 ("media: mtk-vcodec: venc: support SCP firmware") Cc: stable@vger.kernel.org Signed-off-by: Arnd Bergmann Reviewed-by: Nathan Chancellor Reviewed-by: Alexandre Courbot Signed-off-by: Hans Verkuil Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c +++ b/drivers/media/platform/mediatek/vcodec/encoder/venc/venc_h264_if.c @@ -594,7 +594,11 @@ static int h264_enc_init(struct mtk_vcod inst->ctx = ctx; inst->vpu_inst.ctx = ctx; - inst->vpu_inst.id = is_ext ? SCP_IPI_VENC_H264 : IPI_VENC_H264; + if (is_ext) + inst->vpu_inst.id = SCP_IPI_VENC_H264; + else + inst->vpu_inst.id = IPI_VENC_H264; + inst->hw_base = mtk_vcodec_get_reg_addr(inst->ctx->dev->reg_base, VENC_SYS); ret = vpu_enc_init(&inst->vpu_inst);