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

Commit af8361e4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Remove session_suspend and session_resume hooks in HFI"

parents b6709057 a9822b6c

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

+0 −14
Original line number Original line Diff line number Diff line
@@ -774,18 +774,6 @@ static int q6_hfi_session_stop(void *sess) 
		HFI_CMD_SESSION_STOP);

		HFI_CMD_SESSION_STOP);

}

}





static int q6_hfi_session_suspend(void *sess)

{

	return q6_hal_send_session_cmd(sess,

		HFI_CMD_SESSION_SUSPEND);

}



static int q6_hfi_session_resume(void *sess)

{

	return q6_hal_send_session_cmd(sess,

		HFI_CMD_SESSION_RESUME);

}



static int q6_hfi_session_etb(void *sess,

static int q6_hfi_session_etb(void *sess,

			struct vidc_frame_data *input_frame)

			struct vidc_frame_data *input_frame)

{

{
@@ -1368,8 +1356,6 @@ static void q6_init_hfi_callbacks(struct hfi_device *hdev) 
	hdev->session_release_res = q6_hfi_session_release_res;

	hdev->session_release_res = q6_hfi_session_release_res;

	hdev->session_start = q6_hfi_session_start;

	hdev->session_start = q6_hfi_session_start;

	hdev->session_stop = q6_hfi_session_stop;

	hdev->session_stop = q6_hfi_session_stop;

	hdev->session_suspend = q6_hfi_session_suspend;

	hdev->session_resume = q6_hfi_session_resume;

	hdev->session_etb = q6_hfi_session_etb;

	hdev->session_etb = q6_hfi_session_etb;

	hdev->session_ftb = q6_hfi_session_ftb;

	hdev->session_ftb = q6_hfi_session_ftb;

	hdev->session_parse_seq_hdr = q6_hfi_session_parse_seq_hdr;

	hdev->session_parse_seq_hdr = q6_hfi_session_parse_seq_hdr;

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

+0 −14
Original line number Original line Diff line number Diff line
@@ -2679,18 +2679,6 @@ static int venus_hfi_session_stop(void *sess) 
		HFI_CMD_SESSION_STOP);

		HFI_CMD_SESSION_STOP);

}

}





static int venus_hfi_session_suspend(void *sess)

{

	return venus_hfi_send_session_cmd(sess,

		HFI_CMD_SESSION_SUSPEND);

}



static int venus_hfi_session_resume(void *sess)

{

	return venus_hfi_send_session_cmd(sess,

		HFI_CMD_SESSION_RESUME);

}



static int venus_hfi_session_etb(void *sess,

static int venus_hfi_session_etb(void *sess,

				struct vidc_frame_data *input_frame)

				struct vidc_frame_data *input_frame)

{

{
@@ -4236,8 +4224,6 @@ static void venus_init_hfi_callbacks(struct hfi_device *hdev) 
	hdev->session_release_res = venus_hfi_session_release_res;

	hdev->session_release_res = venus_hfi_session_release_res;

	hdev->session_start = venus_hfi_session_start;

	hdev->session_start = venus_hfi_session_start;

	hdev->session_stop = venus_hfi_session_stop;

	hdev->session_stop = venus_hfi_session_stop;

	hdev->session_suspend = venus_hfi_session_suspend;

	hdev->session_resume = venus_hfi_session_resume;

	hdev->session_etb = venus_hfi_session_etb;

	hdev->session_etb = venus_hfi_session_etb;

	hdev->session_ftb = venus_hfi_session_ftb;

	hdev->session_ftb = venus_hfi_session_ftb;

	hdev->session_parse_seq_hdr = venus_hfi_session_parse_seq_hdr;

	hdev->session_parse_seq_hdr = venus_hfi_session_parse_seq_hdr;

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -1304,8 +1304,6 @@ struct hfi_device { 
	int (*session_release_res)(void *sess);

	int (*session_release_res)(void *sess);

	int (*session_start)(void *sess);

	int (*session_start)(void *sess);

	int (*session_stop)(void *sess);

	int (*session_stop)(void *sess);

	int (*session_suspend)(void *sess);

	int (*session_resume)(void *sess);

	int (*session_etb)(void *sess,

	int (*session_etb)(void *sess,

			struct vidc_frame_data *input_frame);

			struct vidc_frame_data *input_frame);

	int (*session_ftb)(void *sess,

	int (*session_ftb)(void *sess,