From patchwork Wed Jun 15 20:44:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 12882902 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 087C8C43334 for ; Wed, 15 Jun 2022 20:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=w3r/wMo2gFPESetyZEBjKTmhO+MHmOrJagCDqeti1Lc=; b=IjdYrHzmyoFaFB 5khHjo8ZSxTNIEwnwTHm4UHgZnoGlIFqg5MELe6HCf3P+4mAoDwAAAga0olxad/PzjRWcmER17efy 82YLphFtkLung1pd7CUrOxjYil1Zk8OunM8ja44QL8gS8Tmh+NTFHpcnjdofD8yqXyFpWdhYOlD1t iG1U15cGb37ydH+IR2KQIIZ3O7xZnYPxzrjwD9T6UFJIkb2NTB4qoBgqkSf5rWG7W9trJfjvam6ei pAfi9WDbRRrBthibJ6GyFHp9iUVlRtCJ28lalWSNReCkG2/TBbBHyz97sxaSe4vDg6XR+3fcBK2sD 2Fmy8Ho0f4AoE5L9Z1Fw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Zt8-00GI1b-OU; Wed, 15 Jun 2022 20:45:18 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o1Zsp-00GHrp-UO for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2022 20:45:01 +0000 Received: by mail-ed1-x52a.google.com with SMTP id v19so17897440edd.4 for ; Wed, 15 Jun 2022 13:44:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NK4/Hf2pXq8vs+whlyiQe78XKedAQVOQEImTLUfGWOc=; b=OstEOMN8l+7npy77KUmPSRCg2LzLv1OR1shAiljV1nNYHy9d/m1pThZxIcx+Kjmnfj ZAScAe4SUfnFwWjLjeJGYAWYy59O1Ml8HXLsS7644REPqg9673p6c87WEWXW3gxlofJQ QrPywh6GbNd+HcWGKYidKe3NugaQbky+dvkolOrEKvd0zIKvECvUDQ6wcfPU6h3zxdko WeKuaGwweoEg43gUJcQwrQ+RmdCD7Nw3CEIB5XVIrOLAj8lW3mJb2Z2m9DM7WStLFEPZ oaqDHcxgwShOgctMEUEPva7Tup/ZeFA3cizW/ZcjNpfg0sGQUBNj6fnOVxkOMu34sUiV p2Hg== 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=NK4/Hf2pXq8vs+whlyiQe78XKedAQVOQEImTLUfGWOc=; b=PUNjbXaDc+VKpcnrdrb6R1wvu7K8Izj9mm0/NxJo/gD3ey7c5LxCyF0mwyD4crUsp1 THbQOYSWWA+M7GYA9Cr8lDI01pf7Waqz8DMdP0HtY1acgZDp9NZcPn3s4zQ7ISLqCyTW EH8lzIsAH2kyuBnCKejsR7+FvrrHWRIFToJbzoSAQSs1htpMsOTMbbnpwwa7YXxIB4Yd AsPY8jgY++FeXO8LzNhs4Mke3hSrP0/sXkddqzTHTEEGbv1TAIYQACb8YzQ1y5m6EEVf DQONUhkWx4T5aH3Ip2QaZ3X/kjcBKIzS6LIqFiUPt31Yzt4dvOOXKe3E0edIyDGEaXOs YXtg== X-Gm-Message-State: AJIora/5TuVpZBBzlh1VR6xO9ZATRmqzsHzrT2HNCblu2Dw6gmA9fMlD bdO1ZlRefeyXhTvXJMy4rQU= X-Google-Smtp-Source: AGRyM1v+txm9b7SzlUcjBJURyyLsNCjRqLfWXvxRuKU4XIbf2Gz0hrB3Tn174dc3BSTZxOxoduxPrg== X-Received: by 2002:aa7:d052:0:b0:42d:d114:43f7 with SMTP id n18-20020aa7d052000000b0042dd11443f7mr2046980edo.320.1655325896550; Wed, 15 Jun 2022 13:44:56 -0700 (PDT) Received: from kista.localdomain (213-161-3-76.dynamic.telemach.net. [213.161.3.76]) by smtp.gmail.com with ESMTPSA id h16-20020a1709060f5000b00711d0b41bcfsm6777291ejj.0.2022.06.15.13.44.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 13:44:56 -0700 (PDT) From: Jernej Skrabec To: mripard@kernel.org, paul.kocialkowski@bootlin.com Cc: mchehab@kernel.org, wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, hverkuil-cisco@xs4all.nl, benjamin.gaignard@collabora.com, nicolas.dufresne@collabora.com, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] media: cedrus: h265: Fix flag name Date: Wed, 15 Jun 2022 22:44:35 +0200 Message-Id: <20220615204436.137377-2-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615204436.137377-1-jernej.skrabec@gmail.com> References: <20220615204436.137377-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220615_134500_015394_FEE13F6B X-CRM114-Status: GOOD ( 12.97 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Bit 21 in register 0x24 (slice header info 1) actually represents negated version of low delay flag. This can be seen in vendor Cedar library source code. While this flag is not part of the standard, it can be found in reference HEVC implementation. Fix macro name and change it to flag. Fixes: 86caab29da78 ("media: cedrus: Add HEVC/H.265 decoding support") Signed-off-by: Jernej Skrabec --- drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 4 +++- drivers/staging/media/sunxi/cedrus/cedrus_regs.h | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c index 44f385be9f6c..2febdf7a97fe 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c @@ -559,7 +559,6 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, reg = VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_TC_OFFSET_DIV2(slice_params->slice_tc_offset_div2) | VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_BETA_OFFSET_DIV2(slice_params->slice_beta_offset_div2) | - VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_POC_BIGEST_IN_RPS_ST(decode_params->num_poc_st_curr_after == 0) | VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_CR_QP_OFFSET(slice_params->slice_cr_qp_offset) | VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_CB_QP_OFFSET(slice_params->slice_cb_qp_offset) | VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_QP_DELTA(slice_params->slice_qp_delta); @@ -572,6 +571,9 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED, slice_params->flags); + if (decode_params->num_poc_st_curr_after == 0) + reg |= VE_DEC_H265_DEC_SLICE_HDR_INFO1_FLAG_SLICE_NOT_LOW_DELAY; + cedrus_write(dev, VE_DEC_H265_DEC_SLICE_HDR_INFO1, reg); chroma_log2_weight_denom = pred_weight_table->luma_log2_weight_denom + diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_regs.h b/drivers/staging/media/sunxi/cedrus/cedrus_regs.h index bdb062ad8682..d81f7513ade0 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_regs.h +++ b/drivers/staging/media/sunxi/cedrus/cedrus_regs.h @@ -377,13 +377,12 @@ #define VE_DEC_H265_DEC_SLICE_HDR_INFO1_FLAG_SLICE_DEBLOCKING_FILTER_DISABLED BIT(23) #define VE_DEC_H265_DEC_SLICE_HDR_INFO1_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED BIT(22) +#define VE_DEC_H265_DEC_SLICE_HDR_INFO1_FLAG_SLICE_NOT_LOW_DELAY BIT(21) #define VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_TC_OFFSET_DIV2(v) \ SHIFT_AND_MASK_BITS(v, 31, 28) #define VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_BETA_OFFSET_DIV2(v) \ SHIFT_AND_MASK_BITS(v, 27, 24) -#define VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_POC_BIGEST_IN_RPS_ST(v) \ - ((v) ? BIT(21) : 0) #define VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_CR_QP_OFFSET(v) \ SHIFT_AND_MASK_BITS(v, 20, 16) #define VE_DEC_H265_DEC_SLICE_HDR_INFO1_SLICE_CB_QP_OFFSET(v) \