Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f94b3863 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Initialize core ops for bengal VPU version"

parents 4244b522 ea1efd0b

msm/vidc/msm_vidc_clocks.c

+6 −2
Original line number Diff line number Diff line
@@ -1682,12 +1682,16 @@ int msm_vidc_decide_core_and_power_mode_iris2(struct msm_vidc_inst *inst) 


void msm_vidc_init_core_clk_ops(struct msm_vidc_core *core)

{

	uint32_t vpu;



	if (!core)

		return;



	if (core->platform_data->vpu_ver == VPU_VERSION_AR50)

	vpu = core->platform_data->vpu_ver;



	if (vpu == VPU_VERSION_AR50 || vpu == VPU_VERSION_AR50_LITE)

		core->core_ops = &core_ops_ar50;

	else if (core->platform_data->vpu_ver == VPU_VERSION_IRIS1)

	else if (vpu == VPU_VERSION_IRIS1)

		core->core_ops = &core_ops_iris1;

	else

		core->core_ops = &core_ops_iris2;

msm/vidc/msm_vidc_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ static struct msm_vidc_platform_data bengal_data = { 
	.efuse_data = NULL,

	.efuse_data_length = 0,

	.sku_version = 0,

	.vpu_ver = VPU_VERSION_AR50_LITE,  // VPU VERSION?

	.vpu_ver = VPU_VERSION_AR50_LITE,

	.ubwc_config = 0x0,

	.codecs = bengal_codecs,

	.codecs_count = ARRAY_SIZE(bengal_codecs),