From patchwork Mon Jul 12 06:05:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 473015 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2699895jao; Mon, 12 Jul 2021 00:50:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwav1gAOZlSYIwLy/aCJnhMxEx9xRcp5rL/fQDusXRlTLokPDEjR1ySGkIFhHPxYPC/XfRG X-Received: by 2002:aa7:d15a:: with SMTP id r26mr5034159edo.172.1626076210724; Mon, 12 Jul 2021 00:50:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626076210; cv=none; d=google.com; s=arc-20160816; b=UTEzhudsknerZTY9G0K3Bkf+7Jt+H+4kMNj0s+KD8tmvmcLeEPvYgUgD0mu28sfdty Yg0iC5w2Ys00T+orNw4W2+ugNP+Po3oV6bXA3T/Cy39uGk9YLd8URq0A1nDTybKiM7tv UZu1fGUwjEtvLV0+XqyuRaDvk6YWeCI28Pn68Y++ZNqsEuivOmr942cqTxatC+6KH6pA r8/WuT+OVn9DZNvCvzLYaAlv/UyJmenQg/i3tpn9ahewmWqWGa9Ig58ZtO39lV21qAOt 2qAr+iw9DRT3aHwIyp/sROTmABTd4iC5xzsf/4GHVyNlREsZNDgzSYc235DC6YPmfSsY nZRw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3Nb11/ieySqkjWxVGjJ/58+6DWu4Q3Vj49gotSUBzVA=; b=cFyrd6UASKEv/lgjqGRmV/ARMUiQt91LhEfiJK6m1WwoUdnvSIKPqhvaVq6JxXiX/d ITC4wbJgmvK2sEx3f5MRHJOaDnUlu9YaCu3LxafU9SByM07zr/DanFiJWd43s7SWXfMl wQmvz47iW4Z79uRx/672gv4OqWPRFm8XWEh2u0MMW5kERILWifAEezAtwh3pXoGiRqEf 5UneaWzRoQNx+W0tn0pZZ4CJBQcxJRsKjwXLdusoOxpPr+SZKwTRqVF/Rt9XI/M1gm26 9ZY6AyOzizHwm7k8ZYF2cF/yv7LFnUwn+JpOyqTcAgcVUZond6xCHWS9k7v7dPVH2x8t qbzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=HbFv3j2m; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n21si13642925eda.13.2021.07.12.00.50.10; Mon, 12 Jul 2021 00:50:10 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=HbFv3j2m; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244760AbhGLHsn (ORCPT + 12 others); Mon, 12 Jul 2021 03:48:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:53510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346751AbhGLHql (ORCPT ); Mon, 12 Jul 2021 03:46:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8673361185; Mon, 12 Jul 2021 07:42:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626075729; bh=b47Ymz7+wtiB7mG7435MjsQbsvspRxQd1UZI8u6CO10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HbFv3j2mG3B/dbKClpGKf56FHUdj5nevKhaX9vvhj8kYAkOp9gzoIkJ8ne4zon2wZ GLfcIUPoCNRYuIprZA/x0lKwju0W2YQFzNxp/EP+4bXeEf3bPT6fmaxy1gdhvjF249 TdOruRyiKcDT0JLp+qmMDCP1vSwgcjs8deD7O994= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stanimir Varbanov , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.13 297/800] media: venus: hfi_cmds: Fix conceal color property Date: Mon, 12 Jul 2021 08:05:20 +0200 Message-Id: <20210712060956.759076957@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stanimir Varbanov [ Upstream commit 6e2202ca1ee034920b029124151754aec67b61ba ] The conceal color property used for Venus v4 and v6 has the same payload structure. But currently v4 follow down to payload structure for v1. Correct this by moving set_property to v4. Fixes: 4ef6039fad8f ("media: venus: vdec: Add support for conceal control") Signed-off-by: Stanimir Varbanov Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/qcom/venus/hfi_cmds.c | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) -- 2.30.2 diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c index 11a8347e5f5c..4b9dea7f6940 100644 --- a/drivers/media/platform/qcom/venus/hfi_cmds.c +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c @@ -1226,6 +1226,17 @@ pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt, pkt->shdr.hdr.size += sizeof(u32) + sizeof(*hdr10); break; } + case HFI_PROPERTY_PARAM_VDEC_CONCEAL_COLOR: { + struct hfi_conceal_color_v4 *color = prop_data; + u32 *in = pdata; + + color->conceal_color_8bit = *in & 0xff; + color->conceal_color_8bit |= ((*in >> 10) & 0xff) << 8; + color->conceal_color_8bit |= ((*in >> 20) & 0xff) << 16; + color->conceal_color_10bit = *in; + pkt->shdr.hdr.size += sizeof(u32) + sizeof(*color); + break; + } case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE: case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER: @@ -1279,17 +1290,6 @@ pkt_session_set_property_6xx(struct hfi_session_set_property_pkt *pkt, pkt->shdr.hdr.size += sizeof(u32) + sizeof(*cq); break; } - case HFI_PROPERTY_PARAM_VDEC_CONCEAL_COLOR: { - struct hfi_conceal_color_v4 *color = prop_data; - u32 *in = pdata; - - color->conceal_color_8bit = *in & 0xff; - color->conceal_color_8bit |= ((*in >> 10) & 0xff) << 8; - color->conceal_color_8bit |= ((*in >> 20) & 0xff) << 16; - color->conceal_color_10bit = *in; - pkt->shdr.hdr.size += sizeof(u32) + sizeof(*color); - break; - } default: return pkt_session_set_property_4xx(pkt, cookie, ptype, pdata); }