From patchwork Wed Jun 27 15:27:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 140351 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1032283ljj; Wed, 27 Jun 2018 08:34:47 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeXZG5SPb+OcdgCR9cCM2EP97MyS3vwF2eRQSU5j5opM8g1iyoYU2GGPEI+k1SqWeK/0vBD X-Received: by 2002:a65:5004:: with SMTP id f4-v6mr5651516pgo.54.1530113687741; Wed, 27 Jun 2018 08:34:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530113687; cv=none; d=google.com; s=arc-20160816; b=FmjBdDEofiNPwG9X8DajGwFkxUPQRfG+TflWAsPnvEH9uGlw1nJp0RUBnqqnMZUOCf NAu74jbl13VfagLJ67jWPT0+Uox38SdW7mRdB8Twt1ltIiMRY0fBchnAzMO2b6mouNDZ pAR9r/7ITm6284MBeHICtbO+xcDiLapG5OUJnyyS8PJhakpyWwGJHzWa9nycjKODePo4 eweapXISUCPvAxS6bhOxuYy3r7P1GUeVN+8QuNps7x+XDgxaDF5UJcZ2EuYceI+jJzeK UIEn/J8hi4UD6TBZDi4DdXoHKv3eMFhC4enm3/fP7M62J7+HofbR+Wkn2YTcsg123Ijg wWVQ== 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=Hv+CE6ij9KP6I/QIzD/Fk3Ze1RPxkF5RyhJ0byX2UzenLUcJ4OTzxoMbCOaj14rwPE bO64gkzvewyg6TFNPfCAjQj1UJ/pHVPKFa4TcDsohRkVm+AHhGIRrFE2Q058xK0o5nXm 5uDV6jsfavOHTFJ8AhdNCCfLehwIouKIMD70+46yfuSbFG6CPHuj+InSOC9JkGBu9op6 BI8rBY+W1fHphTo+yFzxmgOdojdHmCjTZwL2N+TahVZfREFbixeOsxRrfTQgXDcpJOk+ eHfCrQrBiIZ1y7MFcfjFERboFk2IUPNe309hYynDQ8IueNGHWdFkzvppd9pY5cFdRtgR gZ5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RTTIUh1N; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-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 t4-v6si3779273pgc.572.2018.06.27.08.34.47; Wed, 27 Jun 2018 08:34:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-media-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=RTTIUh1N; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-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 S934867AbeF0P2K (ORCPT + 4 others); Wed, 27 Jun 2018 11:28:10 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:46814 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934841AbeF0P2F (ORCPT ); Wed, 27 Jun 2018 11:28:05 -0400 Received: by mail-wr0-f193.google.com with SMTP id t6-v6so2460654wrq.13 for ; Wed, 27 Jun 2018 08:28:05 -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=RTTIUh1NszVoP/tmJF2cGpBKo3PWNyEcYbh7tdayfs5Z+EgDM4BA0/5xTEokTLG/LY /95pr2bp4ocyxMdG6PcNQhuwWys59pCt0g7vM3t6EA1xpm9BGqkpU/jqzuD++JJEUxOS Wy8DFHjD3HOZG1iH4Avy5Fvm1GL+c3wh7CaPc= 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=qBUfXAS9FjM+VFOmuIzUsi3vdwOWO8yYl5sEAxqlyWjcHtjQ65hsWtRx6YdqyeQr9i h+7x1iqUMLORDf0mGELLjWBT+JA3MJvAyTsVUzotKY83yDlIOP3D5cFJjbr6W3BfmN62 duxMFL9sv8LjDlNH2RGuhknXqkQiDl0hOqCKTYf+iZBi9PbZrmu78iJibS3p1Nk9E/2f hmTIVH/Jk1QUUBs59g8ZApNo39ik41FEejC4fvePw0VBZ751B0x6R/qDtvbAytfzDszV u6pcov18PvMX9cU8/EiCGofh2WzcenYQG76uUcSub9dSkVJXnAUVmO0QYTxSALn/BsL5 WqMw== X-Gm-Message-State: APt69E2b8AylPAdcOJBs3xzUZuojXRjmXwHOC1Y2KvK3FxZZmWx+03qi CUTpF/mdl4kmgPvgtBsKMFUr6g== X-Received: by 2002:adf:e590:: with SMTP id l16-v6mr5281175wrm.190.1530113284727; Wed, 27 Jun 2018 08:28:04 -0700 (PDT) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id o203-v6sm2916075wmd.30.2018.06.27.08.28.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jun 2018 08:28:04 -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 , Stanimir Varbanov Subject: [PATCH v4 06/27] venus: hfi: handle buffer output2 type as well Date: Wed, 27 Jun 2018 18:27:04 +0300 Message-Id: <20180627152725.9783-7-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180627152725.9783-1-stanimir.varbanov@linaro.org> References: <20180627152725.9783-1-stanimir.varbanov@linaro.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@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(-) -- 2.14.1 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)