Commit 7ed9e0b3 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Mauro Carvalho Chehab
Browse files

media: venus: hfi, vdec: v6 Add IS_V6() to existing IS_V4() if locations 



In various places in the venus codebase we have if (IS_V4()) which takes
the code down paths for 4xx silicon. This logic is broadly applicable to
6xx silicon also. In this patch we add IS_V6() to various IS_V4() decision
locations.

Co-developed-by: default avatarDikshita Agarwal <dikshita@qti.qualcomm.com>
Signed-off-by: default avatarDikshita Agarwal <dikshita@qti.qualcomm.com>
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 e396e75f

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

+2 −3
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static bool is_dynamic_bufmode(struct venus_inst *inst) 
	 * v4 doesn't send BUFFER_ALLOC_MODE_SUPPORTED property and supports

	 * dynamic buffer mode by default for HFI_BUFFER_OUTPUT/OUTPUT2.

	 */

	if (IS_V4(core))

	if (IS_V4(core) || IS_V6(core))

		return true;



	caps = venus_caps_by_codec(core, inst->hfi_codec, inst->session_type);
@@ -1084,11 +1084,10 @@ int venus_helper_set_work_mode(struct venus_inst *inst, u32 mode) 
	const u32 ptype = HFI_PROPERTY_PARAM_WORK_MODE;

	struct hfi_video_work_mode wm;



	if (!IS_V4(inst->core))

	if (!IS_V4(inst->core) && !IS_V6(inst->core))

		return 0;



	wm.video_work_mode = mode;



	return hfi_session_set_property(inst, ptype, &wm);

}

EXPORT_SYMBOL_GPL(venus_helper_set_work_mode);

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

+2 −2
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ static int venus_sys_set_default_properties(struct venus_hfi_device *hdev) 
	 * enable it explicitly in order to make suspend functional by checking

	 * WFI (wait-for-interrupt) bit.

	 */

	if (IS_V4(hdev->core))

	if (IS_V4(hdev->core) || IS_V6(hdev->core))

		venus_sys_idle_indicator = true;



	ret = venus_sys_set_idle_message(hdev, venus_sys_idle_indicator);
@@ -1577,7 +1577,7 @@ static int venus_suspend_3xx(struct venus_core *core) 


static int venus_suspend(struct venus_core *core)

{

	if (IS_V3(core) || IS_V4(core))

	if (IS_V3(core) || IS_V4(core) || IS_V6(core))

		return venus_suspend_3xx(core);



	return venus_suspend_1xx(core);

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

+3 −3
Original line number Diff line number Diff line
@@ -679,8 +679,8 @@ static int vdec_output_conf(struct venus_inst *inst) 
	if (width > 1920 && height > ALIGN(1080, 32))

		ubwc = true;



	/* For Venus v4 UBWC format is mandatory */

	if (IS_V4(core))

	/* For Venus v4/v6 UBWC format is mandatory */

	if (IS_V4(core) || IS_V6(core))

		ubwc = true;



	ret = venus_helper_get_out_fmts(inst, inst->fmt_cap->pixfmt, &out_fmt,
@@ -731,7 +731,7 @@ static int vdec_output_conf(struct venus_inst *inst) 
			return ret;

	}



	if (IS_V3(core) || IS_V4(core)) {

	if (IS_V3(core) || IS_V4(core) || IS_V6(core)) {

		ret = venus_helper_get_bufreq(inst, HFI_BUFFER_OUTPUT, &bufreq);

		if (ret)

			return ret;