From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753792AbeFAU1z (ORCPT ); Fri, 1 Jun 2018 16:27:55 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:53338 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753532AbeFAU0x (ORCPT ); Fri, 1 Jun 2018 16:26:53 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org AD68660646 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=vgarodia@codeaurora.org From: Vikash Garodia To: hverkuil@xs4all.nl, mchehab@kernel.org, robh@kernel.org, mark.rutland@arm.com, andy.gross@linaro.org, bjorn.andersson@linaro.org, stanimir.varbanov@linaro.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org, vgarodia@codeaurora.org, acourbot@chromium.org Subject: [PATCH v2 2/5] media: venus: add a routine to set venus state Date: Sat, 2 Jun 2018 01:56:05 +0530 Message-Id: <1527884768-22392-3-git-send-email-vgarodia@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1527884768-22392-1-git-send-email-vgarodia@codeaurora.org> References: <1527884768-22392-1-git-send-email-vgarodia@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new routine which abstracts the TZ call to set the video hardware state. Signed-off-by: Vikash Garodia --- drivers/media/platform/qcom/venus/core.h | 5 +++++ drivers/media/platform/qcom/venus/firmware.c | 28 +++++++++++++++++++++++++++ drivers/media/platform/qcom/venus/firmware.h | 1 + drivers/media/platform/qcom/venus/hfi_venus.c | 13 ++++--------- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 85e66e2..e7bfb63 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -35,6 +35,11 @@ struct reg_val { u32 value; }; +enum tzbsp_video_state { + TZBSP_VIDEO_SUSPEND = 0, + TZBSP_VIDEO_RESUME +}; + struct venus_resources { u64 dma_mask; const struct freq_tbl *freq_tbl; diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 7d89b5a..b4664ed 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -53,6 +53,34 @@ static void venus_reset_hw(struct venus_core *core) /* Bring Arm9 out of reset */ writel_relaxed(0, reg_base + WRAPPER_A9SS_SW_RESET); } + +int venus_set_hw_state(enum tzbsp_video_state state, struct venus_core *core) +{ + int ret; + struct device *dev = core->dev; + void __iomem *reg_base = core->base; + + switch (state) { + case TZBSP_VIDEO_SUSPEND: + if (qcom_scm_is_available()) + ret = qcom_scm_set_remote_state(TZBSP_VIDEO_SUSPEND, 0); + else + writel_relaxed(1, reg_base + WRAPPER_A9SS_SW_RESET); + break; + case TZBSP_VIDEO_RESUME: + if (qcom_scm_is_available()) + ret = qcom_scm_set_remote_state(TZBSP_VIDEO_RESUME, 0); + else + venus_reset_hw(core); + break; + default: + dev_err(dev, "invalid state\n"); + break; + } + return ret; +} +EXPORT_SYMBOL_GPL(venus_set_hw_state); + int venus_boot(struct device *dev, const char *fwname) { const struct firmware *mdt; diff --git a/drivers/media/platform/qcom/venus/firmware.h b/drivers/media/platform/qcom/venus/firmware.h index 428efb5..1336729 100644 --- a/drivers/media/platform/qcom/venus/firmware.h +++ b/drivers/media/platform/qcom/venus/firmware.h @@ -18,5 +18,6 @@ int venus_boot(struct device *dev, const char *fwname); int venus_shutdown(struct device *dev); +int venus_set_hw_state(enum tzbsp_video_state, struct venus_core *core); #endif diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c index f61d34b..797a9f5 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include "core.h" @@ -27,6 +26,7 @@ #include "hfi_msgs.h" #include "hfi_venus.h" #include "hfi_venus_io.h" +#include "firmware.h" #define HFI_MASK_QHDR_TX_TYPE 0xff000000 #define HFI_MASK_QHDR_RX_TYPE 0x00ff0000 @@ -55,11 +55,6 @@ #define IFACEQ_VAR_LARGE_PKT_SIZE 512 #define IFACEQ_VAR_HUGE_PKT_SIZE (1024 * 12) -enum tzbsp_video_state { - TZBSP_VIDEO_STATE_SUSPEND = 0, - TZBSP_VIDEO_STATE_RESUME -}; - struct hfi_queue_table_header { u32 version; u32 size; @@ -574,7 +569,7 @@ static int venus_power_off(struct venus_hfi_device *hdev) if (!hdev->power_enabled) return 0; - ret = qcom_scm_set_remote_state(TZBSP_VIDEO_STATE_SUSPEND, 0); + ret = venus_set_hw_state(TZBSP_VIDEO_SUSPEND, hdev->core); if (ret) return ret; @@ -594,7 +589,7 @@ static int venus_power_on(struct venus_hfi_device *hdev) if (hdev->power_enabled) return 0; - ret = qcom_scm_set_remote_state(TZBSP_VIDEO_STATE_RESUME, 0); + ret = venus_set_hw_state(TZBSP_VIDEO_RESUME, hdev->core); if (ret) goto err; @@ -607,7 +602,7 @@ static int venus_power_on(struct venus_hfi_device *hdev) return 0; err_suspend: - qcom_scm_set_remote_state(TZBSP_VIDEO_STATE_SUSPEND, 0); + venus_set_hw_state(TZBSP_VIDEO_SUSPEND, hdev->core); err: hdev->power_enabled = false; return ret; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project