Merge "msm: vidc_3x: Fix llvm frame-larger-than error" into kernel.lnx.4.9.r27-rel (ed12b61f) · Commits · e / devices / android_kernel_fairphone_FP3

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

+9 −19

Original line number	Diff line number	Diff line
		@@ -1382,13 +1382,7 @@ static int hfi_process_session_prop_info(u32 device_id,
		cmd_done.status = VIDC_ERR_NONE;
		cmd_done.data.property.buf_req = buff_req;
		cmd_done.size = sizeof(buff_req);

		*info = (struct msm_vidc_cb_info) {
		.response_type = HAL_SESSION_PROPERTY_INFO,
		.response.cmd = cmd_done,
		};

		return 0;
		break;
		case HFI_PROPERTY_PARAM_PROFILE_LEVEL_CURRENT:
		hfi_process_sess_get_prop_profile_level(pkt, &profile_level);
		cmd_done.device_id = device_id;
		@@ -1400,12 +1394,7 @@ static int hfi_process_session_prop_info(u32 device_id,
		.level = profile_level.level,
		};
		cmd_done.size = sizeof(struct hal_profile_level);

		*info = (struct msm_vidc_cb_info) {
		.response_type = HAL_SESSION_PROPERTY_INFO,
		.response.cmd = cmd_done,
		};
		return 0;
		break;
		case HFI_PROPERTY_CONFIG_VDEC_ENTROPY:
		hfi_process_sess_get_prop_dec_entropy(pkt, &entropy);
		cmd_done.device_id = device_id;
		@@ -1413,18 +1402,19 @@ static int hfi_process_session_prop_info(u32 device_id,
		cmd_done.status = VIDC_ERR_NONE;
		cmd_done.data.property.h264_entropy = entropy;
		cmd_done.size = sizeof(enum hal_h264_entropy);

		*info = (struct msm_vidc_cb_info) {
		.response_type = HAL_SESSION_PROPERTY_INFO,
		.response.cmd = cmd_done,
		};
		return 0;
		break;
		default:
		dprintk(VIDC_DBG,
		"hal_process_session_prop_info: unknown_prop_id: %x\n",
		pkt->rg_property_data[0]);
		return -ENOTSUPP;
		}
		*info = (struct msm_vidc_cb_info) {
		.response_type = HAL_SESSION_PROPERTY_INFO,
		.response.cmd = cmd_done,
		};
		return 0;

		}

		static int hfi_process_session_init_done(u32 device_id,