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

Commit c965c797 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: avoid usage of output_tag to get session_id"

parents 5218224a ea4bc3ec

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

+2 −3
Original line number Diff line number Diff line
@@ -182,10 +182,9 @@ static void hfi_process_evt_release_buffer_ref( 
	data = (struct hfi_msg_release_buffer_ref_event_packet *)

				pkt->rg_ext_event_data;





	cmd_done.device_id = device_id;

	cmd_done.session_id =

		((struct hal_session *)data->output_tag)->session_id;

	cmd_done.session_id = ((struct hal_session *) pkt->session_id)->

		session_id;

	cmd_done.status = VIDC_ERR_NONE;

	cmd_done.size = sizeof(struct msm_vidc_cb_event);

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

+4 −2
Original line number Diff line number Diff line
@@ -287,8 +287,10 @@ struct buffer_info *device_to_uvaddr(struct msm_vidc_inst *inst, 
	struct buffer_info *dummy = NULL;

	int found = 0;

	int i;

	if (!list || !device_addr) {

		dprintk(VIDC_ERR, "Invalid input\n");

	if (!list || !device_addr || !inst) {

		dprintk(VIDC_ERR,

			"Invalid input- list: %p device_addr: %u inst: %p\n",

			list, device_addr, inst);

		goto err_invalid_input;

	}

	mutex_lock(&inst->lock);

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

+3 −1
Original line number Diff line number Diff line
@@ -139,8 +139,10 @@ struct hfi_extradata_header { 
	(HFI_PROPERTY_PARAM_OX_START + 0x008)

#define HFI_PROPERTY_PARAM_S3D_FRAME_PACKING_EXTRADATA	\

	(HFI_PROPERTY_PARAM_OX_START + 0x009)

#define  HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE_SUPPORTED	\

#define HFI_PROPERTY_PARAM_ERR_DETECTION_CODE_EXTRADATA \

	(HFI_PROPERTY_PARAM_OX_START + 0x00A)

#define  HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE_SUPPORTED	\

	(HFI_PROPERTY_PARAM_OX_START + 0x00B)



#define HFI_PROPERTY_CONFIG_OX_START					\

	(HFI_DOMAIN_BASE_COMMON + HFI_ARCH_OX_OFFSET + 0x02000)