Commit c69df5de authored by Neil Armstrong's avatar Neil Armstrong Committed by Hans Verkuil
Browse files

media: platform: qcom/iris: add power_off_controller to vpu_ops 



In order to support the SM8650 iris33 hardware, we need to provide a
specific constoller power off sequences via the vpu_ops callbacks.

Add the callback, and use the current helper for currently supported
platforms.

Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: default avatarDikshita Agarwal <quic_dikshita@quicinc.com>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # x1e Dell
Reviewed-by: default avatarVikash Garodia <quic_vgarodia@quicinc.com>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarBryan O'Donoghue <bod@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
parent f0a0a238

drivers/media/platform/qcom/iris/iris_vpu2.c

+1 −0
Original line number Diff line number Diff line
@@ -34,5 +34,6 @@ static u64 iris_vpu2_calc_freq(struct iris_inst *inst, size_t data_size) 


const struct vpu_ops iris_vpu2_ops = {

	.power_off_hw = iris_vpu_power_off_hw,

	.power_off_controller = iris_vpu_power_off_controller,

	.calc_freq = iris_vpu2_calc_freq,

};

drivers/media/platform/qcom/iris/iris_vpu3.c

+1 −0
Original line number Diff line number Diff line
@@ -118,5 +118,6 @@ static u64 iris_vpu3_calculate_frequency(struct iris_inst *inst, size_t data_siz 


const struct vpu_ops iris_vpu3_ops = {

	.power_off_hw = iris_vpu3_power_off_hardware,

	.power_off_controller = iris_vpu_power_off_controller,

	.calc_freq = iris_vpu3_calculate_frequency,

};

drivers/media/platform/qcom/iris/iris_vpu_common.c

+2 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ int iris_vpu_prepare_pc(struct iris_core *core) 
	return -EAGAIN;

}



static int iris_vpu_power_off_controller(struct iris_core *core)

int iris_vpu_power_off_controller(struct iris_core *core)

{

	u32 val = 0;

	int ret;
@@ -264,7 +264,7 @@ void iris_vpu_power_off(struct iris_core *core) 
{

	dev_pm_opp_set_rate(core->dev, 0);

	core->iris_platform_data->vpu_ops->power_off_hw(core);

	iris_vpu_power_off_controller(core);

	core->iris_platform_data->vpu_ops->power_off_controller(core);

	iris_unset_icc_bw(core);



	if (!iris_vpu_watchdog(core, core->intr_status))

drivers/media/platform/qcom/iris/iris_vpu_common.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ extern const struct vpu_ops iris_vpu3_ops; 


struct vpu_ops {

	void (*power_off_hw)(struct iris_core *core);

	int (*power_off_controller)(struct iris_core *core);

	u64 (*calc_freq)(struct iris_inst *inst, size_t data_size);

};
@@ -22,6 +23,7 @@ void iris_vpu_clear_interrupt(struct iris_core *core); 
int iris_vpu_watchdog(struct iris_core *core, u32 intr_status);

int iris_vpu_prepare_pc(struct iris_core *core);

int iris_vpu_power_on(struct iris_core *core);

int iris_vpu_power_off_controller(struct iris_core *core);

void iris_vpu_power_off_hw(struct iris_core *core);

void iris_vpu_power_off(struct iris_core *core);