Merge "DOWNSTREAM: Fastfoward camx Topic branch to AU200" into dev/msm-4.9-camx
diff --git a/arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi
index 3e27297..d82b74e 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi
@@ -2753,6 +2753,7 @@
pins = "gpio80","gpio79";
bias-pull-down; /* PULL DOWN */
drive-strength = <2>; /* 2 MA */
+ output-low;
};
};
@@ -2809,6 +2810,7 @@
pins = "gpio28";
bias-pull-down; /* PULL DOWN */
drive-strength = <2>; /* 2 MA */
+ output-low;
};
};
@@ -2866,6 +2868,7 @@
pins = "gpio9","gpio8";
bias-pull-down; /* PULL DOWN */
drive-strength = <2>; /* 2 MA */
+ output-low;
};
};
diff --git a/drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c b/drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
index 5055e8d..f878403 100644
--- a/drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
+++ b/drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
@@ -652,7 +652,9 @@
return -ENOMEM;
abort_cmd.size =
- sizeof(struct hfi_cmd_ipebps_async);
+ sizeof(struct hfi_cmd_ipebps_async) +
+ sizeof(struct hfi_cmd_abort_destroy) -
+ sizeof(abort_cmd.payload.direct);
abort_cmd.pkt_type = HFI_CMD_IPEBPS_ASYNC_COMMAND_DIRECT;
if (ctx_data->icp_dev_acquire_info->dev_type == CAM_ICP_RES_TYPE_BPS)
abort_cmd.opcode = HFI_IPEBPS_CMD_OPCODE_BPS_ABORT;
@@ -704,7 +706,9 @@
return -ENOMEM;
destroy_cmd.size =
- sizeof(struct hfi_cmd_ipebps_async);
+ sizeof(struct hfi_cmd_ipebps_async) +
+ sizeof(struct ipe_bps_destroy) -
+ sizeof(destroy_cmd.payload.direct);
destroy_cmd.pkt_type = HFI_CMD_IPEBPS_ASYNC_COMMAND_DIRECT;
if (ctx_data->icp_dev_acquire_info->dev_type == CAM_ICP_RES_TYPE_BPS)
destroy_cmd.opcode = HFI_IPEBPS_CMD_OPCODE_BPS_DESTROY;