samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: driver: fix compilation issues

Browse Source 
Fix compilation issues

Change-Id: Iba42eb95758b27b308b471b10cb56638a3b37f20
Signed-off-by: Akshay Chandrashekhar Kalghatgi <akalghat@codeaurora.org>
This commit is contained in:
Akshay Chandrashekhar Kalghatgi
2020-12-20 23:54:40 -08:00
parent f6936f65e8
commit 9a6bc75fe7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/variant/iris2/src/msm_vidc_iris2.c
View File

@@ -191,7 +191,7 @@ static int __setup_ucregion_memory_map_iris2(struct msm_vidc_core *vidc_core)
(u32)core->sfr.align_device_addr);*/ (u32)core->sfr.align_device_addr);*/
/* update queues vaddr for debug purpose */ /* update queues vaddr for debug purpose */
__write_register(core, CPU_CS_VCICMDARG0_IRIS2, __write_register(core, CPU_CS_VCICMDARG0_IRIS2,
(u32)core->iface_q_table.align_virtual_addr); (u32)((u64)core->iface_q_table.align_virtual_addr));
__write_register(core, CPU_CS_VCICMDARG1_IRIS2, __write_register(core, CPU_CS_VCICMDARG1_IRIS2,
(u32)((u64)core->iface_q_table.align_virtual_addr >> 32)); (u32)((u64)core->iface_q_table.align_virtual_addr >> 32));

10
driver/vidc/src/venus_hfi.c
View File

@@ -1094,6 +1094,7 @@ skip_power_off:
static int __protect_cp_mem(struct msm_vidc_core *core) static int __protect_cp_mem(struct msm_vidc_core *core)
{ {
#if 0
struct tzbsp_memprot memprot; struct tzbsp_memprot memprot;
int rc = 0; int rc = 0;
struct context_bank_info *cb; struct context_bank_info *cb;
@@ -1124,13 +1125,16 @@ static int __protect_cp_mem(struct msm_vidc_core *core)
} }
} }
rc = qcom_scm_mem_protect_video(memprot.cp_start, memprot.cp_size, rc = qcom_scm_mem_protect_video_var(memprot.cp_start, memprot.cp_size,
memprot.cp_nonpixel_start, memprot.cp_nonpixel_size); memprot.cp_nonpixel_start, memprot.cp_nonpixel_size);
if (rc) if (rc)
d_vpr_e("Failed to protect memory(%d)\n", rc); d_vpr_e("Failed to protect memory(%d)\n", rc);
return rc; return rc;
#endif
// TODO: revert once SSG changes merged
return 0;
} }
#if 0 // TODO #if 0 // TODO
static int __core_set_resource(struct msm_vidc_core *core, static int __core_set_resource(struct msm_vidc_core *core,
@@ -2351,14 +2355,12 @@ static int __load_fw(struct msm_vidc_core *core)
} }
} }
// TODO: Prabhakar - revisit once hyp support is available.
#ifdef WAIPIO_PRESIL_CP_ENABLE
rc = __protect_cp_mem(core); rc = __protect_cp_mem(core);
if (rc) { if (rc) {
d_vpr_e("%s: protect memory failed\n", __func__); d_vpr_e("%s: protect memory failed\n", __func__);
goto fail_protect_mem; goto fail_protect_mem;
} }
#endif
/* /*
* Hand off control of regulators to h/w _after_ loading fw. * Hand off control of regulators to h/w _after_ loading fw.
* Note that the GDSC will turn off when switching from normal * Note that the GDSC will turn off when switching from normal