Commit 64afe827 authored by Dikshita Agarwal's avatar Dikshita Agarwal Committed by Mauro Carvalho Chehab
Browse files

media: venus: pm: Toggle 6xx wrapper power in vcodec_control 



When in vcodec_control_v4() on the 4xx path we select between one of two
vcodec cores to toggle power control bits. In 6xx there is only one core
which offsets the relevant control registers to a slightly different
address.

This patch accounts for the address offset for 6xx silicon.

Signed-off-by: default avatarDikshita Agarwal <dikshita@codeaurora.org>
Co-developed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 4b0b6e14

drivers/media/platform/qcom/venus/pm_helpers.c

+4 −1
Original line number Diff line number Diff line
@@ -414,7 +414,10 @@ static int vcodec_control_v4(struct venus_core *core, u32 coreid, bool enable) 
	u32 val;

	int ret;



	if (coreid == VIDC_CORE_ID_1) {

	if (IS_V6(core)) {

		ctrl = core->wrapper_base + WRAPPER_CORE_POWER_CONTROL_V6;

		stat = core->wrapper_base + WRAPPER_CORE_POWER_STATUS_V6;

	} else if (coreid == VIDC_CORE_ID_1) {

		ctrl = core->wrapper_base + WRAPPER_VCODEC0_MMCC_POWER_CONTROL;

		stat = core->wrapper_base + WRAPPER_VCODEC0_MMCC_POWER_STATUS;

	} else {