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

Commit 883e4ff9 authored by Arun Menon's avatar Arun Menon Committed by Matt Wagantall
Browse files

msm: vidc: Remove explicit flush call for OUTPUT2 



Firmware will flush both OUTPUT and OUTPUT2 when
flush is called on OUTPUT. There is no need to
invoke flush explicitly for OUTPUT2, and is not
supported by firmware.

Change-Id: Ib71c8438592f1b763b4a74879ab67a3605cc499a
Signed-off-by: default avatarArun Menon <avmenon@codeaurora.org>
parent 019192c2

drivers/media/platform/msm/vidc/hfi_packetization.c

+0 −3
Original line number Diff line number Diff line
@@ -839,9 +839,6 @@ int create_pkt_cmd_session_flush(struct hfi_cmd_session_flush_packet *pkt, 
	case HAL_FLUSH_OUTPUT:

		pkt->flush_type = HFI_FLUSH_OUTPUT;

		break;

	case HAL_FLUSH_OUTPUT2:

		pkt->flush_type = HFI_FLUSH_OUTPUT2;

		break;

	case HAL_FLUSH_ALL:

		pkt->flush_type = HFI_FLUSH_ALL;

		break;

drivers/media/platform/msm/vidc/msm_vidc_common.c

+0 −5
Original line number Diff line number Diff line
@@ -3736,11 +3736,6 @@ int msm_comm_flush(struct msm_vidc_inst *inst, u32 flags) 
		mutex_unlock(&inst->pendingq.lock);

		rc = call_hfi_op(hdev, session_flush, inst->session,

				HAL_FLUSH_OUTPUT);

		if (!rc && msm_comm_get_stream_output_mode(inst) ==

			HAL_VIDEO_DECODER_SECONDARY)

			rc = call_hfi_op(hdev, session_flush, inst->session,

				HAL_FLUSH_OUTPUT2);



	} else {

		msm_comm_flush_pending_dynamic_buffers(inst);

		/*

drivers/media/platform/msm/vidc/vidc_hfi.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ 


#define HFI_FLUSH_INPUT (HFI_OX_BASE + 0x1)

#define HFI_FLUSH_OUTPUT (HFI_OX_BASE + 0x2)

#define HFI_FLUSH_OUTPUT2 (HFI_OX_BASE + 0x3)

#define HFI_FLUSH_ALL (HFI_OX_BASE + 0x4)



#define HFI_EXTRADATA_NONE					0x00000000

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+0 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,6 @@ struct vidc_seq_hdr { 
enum hal_flush {

	HAL_FLUSH_INPUT,

	HAL_FLUSH_OUTPUT,

	HAL_FLUSH_OUTPUT2,

	HAL_FLUSH_ALL,

	HAL_UNUSED_FLUSH = 0x10000000,

};