From patchwork Mon May 10 10:22:25 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: 433138 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2823468jao; Mon, 10 May 2021 06:06:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhXJg/foRfM/sDWzTEl+aVgtrcasmPUFApCLFi1HLoMDINoyh1CQH19fdHn8I8Bt0+Go8u X-Received: by 2002:a6b:e719:: with SMTP id b25mr17270819ioh.49.1620651986999; Mon, 10 May 2021 06:06:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620651986; cv=none; d=google.com; s=arc-20160816; b=i4Zu1BszK8s4Q23OMRxQbz4tXnEMC3/ZgqdSsl69EDzSWj4X7KmnER+IVaOklvP3za LJmoB8S2gxuuVslUMgVTwk+ovPZJH3m8KNSDVA+BHS0eI3xz8BgKRW15vMYx2NMDP0Cl rlZmIR/7+eyDPt1Oc8c3C0VE0CuxvEpm8vVA281iNlpvPR9diiqb+pAh9qcOZTVnRDHb fmzE5jyfUBMhyfYm4onEhiyA7sW3u251Vz0GBCkyzvppv3XJV71igC/K2dvCFWG1FyQb Iu6dnYuPV+oOhTuNTBK5lSN2WA48wiiAe0CPs1Hv5bn541YrISEqddc9uJOwoCzn0CHE 6Cpg== 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=eWPlou8KtwGjTJy1f43BkSLQBgj8Fdzc9vdXH1ljZlw=; b=fjj28+ZEMO4UbeCbBugy9Rx6asKYyHXMpyScN/BbMNqC1GFrB2t4kyu8/BLZhli7Ad uqN/09okiQMURSC0lMY4Wxfo6nSwsNiJLUAekIS+svlTQRrKSvFAxBKjtUXQBTbxYENK 31Kl5dX9uq5yVN3RNLeQOwnHzh2JCof2Ulmpf18wpw9G03G8wQ58h0TUg46KC28h/gey CubsI1M7Qlm8Udr9Hu6bBmfAJa3cewmdlnSwVNLJLl8SIxBySdKcUwFcnNhQy3c6lz+y YlImJ/QLsHiXtiUoGSacgXPnh73qB5T3M1p0Vz5ZCGzpAxFplViQg2bHg9R/8jmBvHpi LmwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tadUuC4w; 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 q8si16406157ior.12.2021.05.10.06.06.26; Mon, 10 May 2021 06:06:26 -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=tadUuC4w; 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 S237836AbhEJLZg (ORCPT + 12 others); Mon, 10 May 2021 07:25:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:34702 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237949AbhEJLQg (ORCPT ); Mon, 10 May 2021 07:16:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A315561352; Mon, 10 May 2021 11:11:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620645108; bh=aK8xdx49Lz2xeZhUZMs4SCAmyEOmZj+EX3+HZwbSzKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tadUuC4wlyGGLSiLeVRd3kzzxNyo6KLtU9uiAUGz3j7QSo6Mtd4STwADH1Fs/z8NC lVWYZI+tYK05daFINLwejEl5CMcmZn8+g8AuZO3brdnlUWiLGwcC52zPVvggr0lcPm i/ydK/zmUgGCpP0HWMDxCAlebrutIHIYWnwn+Oy0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stanimir Varbanov , Bryan ODonoghue , Mauro Carvalho Chehab Subject: [PATCH 5.12 356/384] media: venus: hfi_cmds: Support plane-actual-info property from v1 Date: Mon, 10 May 2021 12:22:25 +0200 Message-Id: <20210510102026.495641862@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@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 commit 15447d18b1b877d9c6f979bd00088e470a4e0e9f upstream. The property is supported from v1 and upwards. So move it to set_property_1x. Fixes: 01e869e78756 ("media: venus: venc: fix handlig of S_SELECTION and G_SELECTION") Cc: stable@vger.kernel.org # v5.12 Signed-off-by: Stanimir Varbanov Tested-by: Bryan O'Donoghue Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/qcom/venus/hfi_cmds.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) --- a/drivers/media/platform/qcom/venus/hfi_cmds.c +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c @@ -1039,6 +1039,18 @@ static int pkt_session_set_property_1x(s pkt->shdr.hdr.size += sizeof(u32) + sizeof(*hierp); break; } + case HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_INFO: { + struct hfi_uncompressed_plane_actual_info *in = pdata; + struct hfi_uncompressed_plane_actual_info *info = prop_data; + + info->buffer_type = in->buffer_type; + info->num_planes = in->num_planes; + info->plane_format[0] = in->plane_format[0]; + if (in->num_planes > 1) + info->plane_format[1] = in->plane_format[1]; + pkt->shdr.hdr.size += sizeof(u32) + sizeof(*info); + break; + } /* FOLLOWING PROPERTIES ARE NOT IMPLEMENTED IN CORE YET */ case HFI_PROPERTY_CONFIG_BUFFER_REQUIREMENTS: @@ -1205,18 +1217,6 @@ pkt_session_set_property_4xx(struct hfi_ pkt->shdr.hdr.size += sizeof(u32) + sizeof(*cu); break; } - case HFI_PROPERTY_PARAM_UNCOMPRESSED_PLANE_ACTUAL_INFO: { - struct hfi_uncompressed_plane_actual_info *in = pdata; - struct hfi_uncompressed_plane_actual_info *info = prop_data; - - info->buffer_type = in->buffer_type; - info->num_planes = in->num_planes; - info->plane_format[0] = in->plane_format[0]; - if (in->num_planes > 1) - info->plane_format[1] = in->plane_format[1]; - pkt->shdr.hdr.size += sizeof(u32) + sizeof(*info); - break; - } case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE: case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER: case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE: