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

Commit 8e72b35f authored by Sridhar Gujje's avatar Sridhar Gujje
Browse files

Merge remote-tracking branch 'dev/msm-4.14-camx' into msm-4.14 04/27 



* commit '2c0a6af9':
  ARM: dts: msm: Fix Rotation issue UW camera for sdmmagpie
  msm: camera: reqmgr: Get the index difference properly
  ARM: dts: msm: Flash support for UW camera for sdmmagpie
  msm: camera: core: release ref after config failed
  msm: camera: icp: icp debug improvement
  msm: camera: isp: clearing isp context entries for rdi_only_context
  msm: camera: Additional information to ICP page fault handler

Change-Id: I6754627b9256141c0a1c5c8001e437c7f4eb742d
Signed-off-by: default avatarSridhar Gujje <sgujje@codeaurora.org>
parents 4f1b5e51 2c0a6af9

arch/arm64/boot/dts/qcom/sdmmagpie-camera-sensor-idp.dtsi

+13 −3
Original line number Diff line number Diff line
@@ -33,6 +33,16 @@ 
		switch-source = <&pm6150l_switch2 &pm6150l_switch2>;

		status = "ok";

	};



	led_flash_rear_aux2: qcom,camera-flash@2 {

		cell-index = <2>;

		reg = <0x02 0x00>;

		compatible = "qcom,camera-flash";

		flash-source = <&pm6150l_flash0 &pm6150l_flash1>;

		torch-source = <&pm6150l_torch0 &pm6150l_torch1>;

		switch-source = <&pm6150l_switch2 &pm6150l_switch2>;

		status = "ok";

	};

};



&cam_cci0 {
@@ -525,11 +535,11 @@ 
		compatible = "qcom,cam-sensor";

		reg = <0x6>;

		csiphy-sd-index = <2>;

		sensor-position-roll = <270>;

		sensor-position-roll = <90>;

		sensor-position-pitch = <0>;

		sensor-position-yaw = <0>;

		sensor-position-yaw = <180>;

		eeprom-src = <&eeprom_triple_uw>;

		led-flash-src = <&led_flash_rear_aux>;

		led-flash-src = <&led_flash_rear_aux2>;

		actuator-src = <&actuator_rear_aux>;

		cam_vio-supply = <&pm8009_l7>;

		cam_vana-supply = <&pm8009_l6>;

drivers/media/platform/msm/camera/cam_core/cam_context.c

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ int cam_context_dump_pf_info(struct cam_context *ctx, unsigned long iova, 
		rc = ctx->state_machine[ctx->state].pagefault_ops(ctx, iova,

			buf_info);

	} else {

		CAM_WARN(CAM_CORE, "No dump ctx in dev %d, state %d",

		CAM_INFO(CAM_CORE, "No dump ctx in dev %d, state %d",

			ctx->dev_hdl, ctx->state);

	}

	mutex_unlock(&ctx->ctx_mutex);

drivers/media/platform/msm/camera/cam_core/cam_context_utils.c

+5 −3
Original line number Diff line number Diff line
@@ -480,8 +480,7 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
						ctx->dev_name, ctx->ctx_id,

						req->request_id);



				cam_context_putref(ctx);

				goto put_ref;

				goto put_ctx_ref;

			}

			CAM_DBG(CAM_CTXT, "register in fence cb: %d ret = %d",

				req->in_map_entries[j].sync_id, rc);
@@ -493,7 +492,9 @@ int32_t cam_context_prepare_dev_to_hw(struct cam_context *ctx, 
			ctx->dev_name, ctx->ctx_id);



	return rc;



put_ctx_ref:

	for (j; j >= 0; j--)

		cam_context_putref(ctx);

put_ref:

	for (--i; i >= 0; i--) {

		if (cam_sync_put_obj_ref(req->out_map_entries[i].sync_id))
@@ -1021,6 +1022,7 @@ int32_t cam_context_dump_pf_info_to_hw(struct cam_context *ctx, 
		cmd_args.ctxt_to_hw_map = ctx->ctxt_to_hw_map;

		cmd_args.cmd_type = CAM_HW_MGR_CMD_DUMP_PF_INFO;

		cmd_args.u.pf_args.pf_data.packet = packet;

		cmd_args.u.pf_args.pf_data.ctx_id = ctx->ctx_id;

		cmd_args.u.pf_args.iova = iova;

		cmd_args.u.pf_args.buf_info = buf_info;

		cmd_args.u.pf_args.mem_found = mem_found;

drivers/media/platform/msm/camera/cam_core/cam_hw_mgr_intf.h

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -144,9 +144,11 @@ struct cam_hw_stop_args { 
 * struct cam_hw_mgr_dump_pf_data - page fault debug data

 *

 * packet:     pointer to packet

 * ctx_id:     context id

 */

struct cam_hw_mgr_dump_pf_data {

	void    *packet;

	uint32_t ctx_id;

};



/**

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -1620,7 +1620,7 @@ static int cam_fd_mgr_hw_prepare_update(void *hw_mgr_priv, 


	/* We do not expect any patching, but just do it anyway */

	rc = cam_packet_util_process_patches(prepare->packet,

		hw_mgr->device_iommu.non_secure, -1);

		hw_mgr->device_iommu.non_secure, -1, 0);

	if (rc) {

		CAM_ERR(CAM_FD, "Patch FD packet failed, rc=%d", rc);

		return rc;