diff options
| author | Linaro CI <ci_notify@linaro.org> | 2020-07-07 17:48:54 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2020-07-07 17:48:54 +0000 |
| commit | 84daabc100659da53afbea01dce5a266498c332b (patch) | |
| tree | 25088420ca27fcf11c5813db55f3146c6be087b6 /drivers/media/platform/qcom/venus | |
| parent | 409a85e3081d0631bf0850fe655675a475d20856 (diff) | |
| parent | cc6248da18ffbd7302dee6b6034912361482d8fc (diff) | |
Merge remote-tracking branch 'alimon-fixes/tracking-qcomlt-fixes-alimon' into integration-linux-qcomltintegration-linux-qcomlt-20200708-123738-v5.8-rc4-201-g84daabc10065
Diffstat (limited to 'drivers/media/platform/qcom/venus')
| -rw-r--r-- | drivers/media/platform/qcom/venus/core.c | 4 | ||||
| -rw-r--r-- | drivers/media/platform/qcom/venus/core.h | 4 | ||||
| -rw-r--r-- | drivers/media/platform/qcom/venus/firmware.c | 18 |
3 files changed, 25 insertions, 1 deletions
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 203c6538044f..5f8f7b72731c 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -527,6 +527,10 @@ static const struct venus_resources sdm845_res_v2 = { .vmem_size = 0, .vmem_addr = 0, .dma_mask = 0xe0000000 - 1, + .cp_start = 0, + .cp_size = 0x70800000, + .cp_nonpixel_start = 0x1000000, + .cp_nonpixel_size = 0x24800000, .fwname = "qcom/venus-5.2/venus.mdt", }; diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 7118612673c9..8c88516e4694 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -68,6 +68,10 @@ struct venus_resources { unsigned int vmem_id; u32 vmem_size; u32 vmem_addr; + u32 cp_start; + u32 cp_size; + u32 cp_nonpixel_start; + u32 cp_nonpixel_size; const char *fwname; }; diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 8801a6a7543d..ac906ffc608f 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -181,6 +181,7 @@ static int venus_shutdown_no_tz(struct venus_core *core) int venus_boot(struct venus_core *core) { struct device *dev = core->dev; + const struct venus_resources *res = core->res; phys_addr_t mem_phys; size_t mem_size; int ret; @@ -200,7 +201,22 @@ int venus_boot(struct venus_core *core) else ret = venus_boot_no_tz(core, mem_phys, mem_size); - return ret; + if (ret) + return ret; + + if (core->use_tz && res->cp_size) { + ret = qcom_scm_mem_protect_video_var(res->cp_start, + res->cp_size, + res->cp_nonpixel_start, + res->cp_nonpixel_size); + if (ret) { + dev_err(dev, "set virtual address ranges fail (%d)\n", + ret); + return ret; + } + } + + return 0; } int venus_shutdown(struct venus_core *core) |