Commit 1f01a498 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mauro Carvalho Chehab
Browse files

media: iris: Split power on per variants 



Current devices use same power up sequence, but starting with Qualcomm
SM8750 (VPU v3.5) the sequence will grow quite a bit, so allow
customizing it.  No functional change so far for existing devices.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarDikshita Agarwal <quic_dikshita@quicinc.com>
Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarBryan O'Donoghue <bod@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 2fbb823a

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

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 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_on_hw = iris_vpu_power_on_hw,

	.power_off_controller = iris_vpu_power_off_controller,

	.power_on_controller = iris_vpu_power_on_controller,

	.calc_freq = iris_vpu2_calc_freq,

};

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

+4 −0
Original line number Diff line number Diff line
@@ -292,12 +292,16 @@ static u64 iris_vpu3x_calculate_frequency(struct iris_inst *inst, size_t data_si 


const struct vpu_ops iris_vpu3_ops = {

	.power_off_hw = iris_vpu3_power_off_hardware,

	.power_on_hw = iris_vpu_power_on_hw,

	.power_off_controller = iris_vpu_power_off_controller,

	.power_on_controller = iris_vpu_power_on_controller,

	.calc_freq = iris_vpu3x_calculate_frequency,

};



const struct vpu_ops iris_vpu33_ops = {

	.power_off_hw = iris_vpu33_power_off_hardware,

	.power_on_hw = iris_vpu_power_on_hw,

	.power_off_controller = iris_vpu33_power_off_controller,

	.power_on_controller = iris_vpu_power_on_controller,

	.calc_freq = iris_vpu3x_calculate_frequency,

};

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

+4 −4
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ void iris_vpu_power_off(struct iris_core *core) 
		disable_irq_nosync(core->irq);

}



static int iris_vpu_power_on_controller(struct iris_core *core)

int iris_vpu_power_on_controller(struct iris_core *core)

{

	u32 rst_tbl_size = core->iris_platform_data->clk_rst_tbl_size;

	int ret;
@@ -302,7 +302,7 @@ static int iris_vpu_power_on_controller(struct iris_core *core) 
	return ret;

}



static int iris_vpu_power_on_hw(struct iris_core *core)

int iris_vpu_power_on_hw(struct iris_core *core)

{

	int ret;
@@ -337,11 +337,11 @@ int iris_vpu_power_on(struct iris_core *core) 
	if (ret)

		goto err;



	ret = iris_vpu_power_on_controller(core);

	ret = core->iris_platform_data->vpu_ops->power_on_controller(core);

	if (ret)

		goto err_unvote_icc;



	ret = iris_vpu_power_on_hw(core);

	ret = core->iris_platform_data->vpu_ops->power_on_hw(core);

	if (ret)

		goto err_power_off_ctrl;

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

+4 −0
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ extern const struct vpu_ops iris_vpu33_ops; 


struct vpu_ops {

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

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

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

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

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

};
@@ -23,6 +25,8 @@ void iris_vpu_raise_interrupt(struct iris_core *core); 
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_controller(struct iris_core *core);

int iris_vpu_power_on_hw(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);