[06/28] venus: hfi: handle buffer output2 type as well

Message ID	20180424124436.26955-7-stanimir.varbanov@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org 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; From: Stanimir Varbanov <stanimir.varbanov@linaro.org> To: Mauro Carvalho Chehab <mchehab@kernel.org>, Hans Verkuil <hverkuil@xs4all.nl> Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Vikash Garodia <vgarodia@codeaurora.org>, Stanimir Varbanov <stanimir.varbanov@linaro.org> Subject: [PATCH 06/28] venus: hfi: handle buffer output2 type as well Date: Tue, 24 Apr 2018 15:44:14 +0300 Message-Id: <20180424124436.26955-7-stanimir.varbanov@linaro.org> In-Reply-To: <20180424124436.26955-1-stanimir.varbanov@linaro.org> References: <20180424124436.26955-1-stanimir.varbanov@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	Venus updates \| expand [00/28] Venus updates [01/28] venus: hfi_msgs: correct pointer increment [02/28] venus: hfi: preparation to support venus 4xx [05/28] venus: hfi: support session continue for 4xx version [06/28] venus: hfi: handle buffer output2 type as well [07/28] venus: hfi_venus: add halt AXI support for Venus 4xx [08/28] venus: hfi_venus: add suspend function for 4xx version [11/28] venus: add common capability parser [13/28] venus: core: delete not used flag for buffer mode [14/28] venus: helpers: rename a helper function and use buffer mode from caps [15/28] venus: add a helper function to set dynamic buffer mode [17/28] venus: delete no longer used bufmode flag from instance [18/28] venus: helpers: add buffer type argument to a helper [23/28] venus: vdec: get required input buffers as well [25/28] venus: move frame size calculations in common place [26/28] venus: implementing multi-stream support

Message ID

20180424124436.26955-7-stanimir.varbanov@linaro.org

State

Superseded

Headers

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; 
From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
	Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-msm@vger.kernel.org, Vikash Garodia <vgarodia@codeaurora.org>,
	Stanimir Varbanov <stanimir.varbanov@linaro.org>
Subject: [PATCH 06/28] venus: hfi: handle buffer output2 type as well
Date: Tue, 24 Apr 2018 15:44:14 +0300
Message-Id: <20180424124436.26955-7-stanimir.varbanov@linaro.org>
In-Reply-To: <20180424124436.26955-1-stanimir.varbanov@linaro.org>
References: <20180424124436.26955-1-stanimir.varbanov@linaro.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

Venus updates | expand

Commit Message

Stanimir Varbanov April 24, 2018, 12:44 p.m. UTC

This adds handling of buffers of type OUTPUT2 which is needed to
support Venus 4xx version.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>

---
 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 5970e9b1716b..023802e62833 100644
--- a/drivers/media/platform/qcom/venus/hfi_msgs.c
+++ b/drivers/media/platform/qcom/venus/hfi_msgs.c
@@ -825,7 +825,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)

[06/28] venus: hfi: handle buffer output2 type as well

Commit Message

Patch