Received: by 2002:ac0:a591:0:0:0:0:0 with SMTP id m17-v6csp618741imm; Thu, 5 Jul 2018 06:13:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfy+mIakXeCcqzgubg++HJRWlX2Jz4w1wXPuunqjre5eaM6q8gSWt96PJ/Jro66EVvn+OjV X-Received: by 2002:a65:418b:: with SMTP id a11-v6mr5591833pgq.118.1530796438970; Thu, 05 Jul 2018 06:13:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530796438; cv=none; d=google.com; s=arc-20160816; b=CO3V2ZzywJBhZTsk0/IPzorMhVkD8bnTbxl7rWoFZCa6dMT0pVPAQ8UyfcY/jxiJDQ z3BWoD442AR54ebngswpPaYL1wcKXwQVdwYwdk8VyKnTdrltPTdgAMV6yLT44wDcufog x9z3bHJ/2/bTci5AbihSvPQyU2jLxqiZFHNqYS30hb2dUJh+dstvu8v2eBtWVjLdapbo lk0G0axSGirj9IS2JGcvK3vYVKFXtiHJPojqiJJ14/U3hWAeVDxaBAw01PiRguR9Sa57 1NjOku5Vm7EWLvDzqGNS1u8rT1X0uLq3k6AqOTziRyoEPCb1uyn0Ungh8MkTHGraVqqu XfLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=DopT6tfRa5ZXddiWA2KYWqHxQ5fQ330DwA7mzNfZ1z4=; b=x0Ab48JkiFVsfff2VA+m4DwAFduLW89QGEH0j0yeVYCxVMVt3FjBWcE3IswkRyay+f NAYroY8dGwZrvPwv2HMq/4rzvKiKfvW1e1bqIKUNNNMF11/CQTNdBPf4oQ/4tsjEnV4J 4NMZk1om7u+h3lGMRvPUHtjpVWl32+xB5GqR5skIkWc5EKZB7MfQb+/VVMQJcTrHxF2g soamjH+ei6rCRigRY1rgUHIkKCMQ9+9ZFuWho3+T6IOPwUfSjeO5SBgMdYLhB22cWind wtUucsN1m3Tu83Znvky90apvzfghxTmT9gY4nbM1y2juPkU8jab7yQBo0+xytt3kabdA UcIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sxjl44Ch; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2-v6si5580203pgf.334.2018.07.05.06.13.44; Thu, 05 Jul 2018 06:13:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sxjl44Ch; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754373AbeGENFT (ORCPT + 99 others); Thu, 5 Jul 2018 09:05:19 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41911 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754291AbeGENFO (ORCPT ); Thu, 5 Jul 2018 09:05:14 -0400 Received: by mail-wr1-f65.google.com with SMTP id h10-v6so1137324wrq.8 for ; Thu, 05 Jul 2018 06:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DopT6tfRa5ZXddiWA2KYWqHxQ5fQ330DwA7mzNfZ1z4=; b=Sxjl44ChUU1xaGXSh8Zizx2qkhpkRjvpO2dUOD8sZkgIzziO8yyJWCtA0t0+W+sY+G 9pj+GSf3MHPK4+mHXAbo1BbgfXg+6zX61J6+iDgXmNEK6Lt3NAvvSFNtpvPbxsdhLp5q 9RXkA8w1oaXus0qQ9ebprLlzb6lHUQu5avSsw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DopT6tfRa5ZXddiWA2KYWqHxQ5fQ330DwA7mzNfZ1z4=; b=g/iwRCCGPFhJQD5vVtYy/JDkljYhC9TvCgFtkAhUAG3XrvtJcQp7NMDQtEZklcRSx/ AVgsh00MPxf6gvIf1z2GLiI8QzrpzDaTkK7up7q/z1jezp2+m+2ArjVrvFM7/0207ZCC qBynEB/xfjPKap0zOe83Uap4VoQ3h51lN3bqlAhz6mcO/49buOWfivktGriXLjGSYQmM wzrzTdzY5wGBZiRKYP5mY2SmRDPa9nzC5UCKTPkTnDhlwKTfWxOHtiX+TKhKhYhfo49Q Cq6BxCJb92vSC+Wx+Nlw/4z1kWNtFxwXUIjbySxJ8tue6JXTyQcIuYdDOj8Ko4/HP5BM PjKw== X-Gm-Message-State: APt69E3Y1vpMqXQJO85PoKKk8ZnEEK89xmwblxOmsXp8jiSZlwTMlJJj mmmRtbixe9ZyPo6vB7dA6mvVZg== X-Received: by 2002:adf:e9c1:: with SMTP id l1-v6mr4308779wrn.14.1530795913157; Thu, 05 Jul 2018 06:05:13 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id 11-v6sm2109102wrw.67.2018.07.05.06.05.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 06:05:12 -0700 (PDT) From: Stanimir Varbanov To: Mauro Carvalho Chehab , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Vikash Garodia , Tomasz Figa , Alexandre Courbot , Stanimir Varbanov Subject: [PATCH v5 06/27] venus: hfi: handle buffer output2 type as well Date: Thu, 5 Jul 2018 16:03:40 +0300 Message-Id: <20180705130401.24315-7-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180705130401.24315-1-stanimir.varbanov@linaro.org> References: <20180705130401.24315-1-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds handling of buffers of type OUTPUT2 which is needed to support Venus 4xx version. Signed-off-by: Stanimir Varbanov Reviewed-by: Tomasz Figa --- drivers/media/platform/qcom/venus/hfi.c | 3 ++- drivers/media/platform/qcom/venus/hfi_msgs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/venus/hfi.c b/drivers/media/platform/qcom/venus/hfi.c index cbc6fad05e47..a570fdad0de0 100644 --- a/drivers/media/platform/qcom/venus/hfi.c +++ b/drivers/media/platform/qcom/venus/hfi.c @@ -473,7 +473,8 @@ int hfi_session_process_buf(struct venus_inst *inst, struct hfi_frame_data *fd) if (fd->buffer_type == HFI_BUFFER_INPUT) return ops->session_etb(inst, fd); - else if (fd->buffer_type == HFI_BUFFER_OUTPUT) + else if (fd->buffer_type == HFI_BUFFER_OUTPUT || + fd->buffer_type == HFI_BUFFER_OUTPUT2) return ops->session_ftb(inst, fd); return -EINVAL; diff --git a/drivers/media/platform/qcom/venus/hfi_msgs.c b/drivers/media/platform/qcom/venus/hfi_msgs.c index 54cd41e5837c..c0f3bef8299f 100644 --- a/drivers/media/platform/qcom/venus/hfi_msgs.c +++ b/drivers/media/platform/qcom/venus/hfi_msgs.c @@ -823,7 +823,8 @@ static void hfi_session_ftb_done(struct venus_core *core, error = HFI_ERR_SESSION_INVALID_PARAMETER; } - if (buffer_type != HFI_BUFFER_OUTPUT) + if (buffer_type != HFI_BUFFER_OUTPUT && + buffer_type != HFI_BUFFER_OUTPUT2) goto done; if (hfi_flags & HFI_BUFFERFLAG_EOS) -- 2.14.1