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

Commit c9028a23 authored by Shashank Babu Chinta Venkata's avatar Shashank Babu Chinta Venkata
Browse files

input: touchscreen: st: release i2c session early 



Release I2C session lock before releasing IO region in TVM
during trusted touch scenario.

Change-Id: I221862eef47b4dae90c63c4768c65265c7806001
Signed-off-by: default avatarShashank Babu Chinta Venkata <sbchin@codeaurora.org>
parent 323f338f

drivers/input/touchscreen/st/fts.c

+7 −7
Original line number Diff line number Diff line
@@ -604,6 +604,9 @@ static void fts_trusted_touch_tvm_vm_mode_disable(struct fts_ts_info *info) 


	flushFIFO();

	release_all_touches(info);

	pm_runtime_put_sync(info->client->adapter->dev.parent);

	fts_trusted_touch_set_tvm_driver_state(info,

					TVM_I2C_SESSION_RELEASED);

	rc = fts_vm_mem_release(info);

	if (rc) {

		pr_err("Failed to release mem rc:%d\n", rc);
@@ -612,9 +615,6 @@ static void fts_trusted_touch_tvm_vm_mode_disable(struct fts_ts_info *info) 
		fts_trusted_touch_set_tvm_driver_state(info,

					TVM_IOMEM_RELEASED);

	}

	pm_runtime_put_sync(info->client->adapter->dev.parent);

	fts_trusted_touch_set_tvm_driver_state(info,

					TVM_I2C_SESSION_RELEASED);

	fts_trusted_touch_set_tvm_driver_state(info, TRUSTED_TOUCH_TVM_INIT);

	atomic_set(&info->trusted_touch_enabled, 0);

	pr_info("trusted touch disabled\n");
@@ -692,16 +692,16 @@ static void fts_trusted_touch_abort_tvm(struct fts_ts_info *info) 
	case TVM_IRQ_RELEASED:

		flushFIFO();

		release_all_touches(info);

		pm_runtime_put_sync(info->client->adapter->dev.parent);

	case TVM_I2C_SESSION_RELEASED:

		rc = fts_vm_mem_release(info);

		if (rc)

			pr_err("Failed to release mem rc:%d\n", rc);

	case TVM_IOMEM_RELEASED:

		pm_runtime_put_sync(info->client->adapter->dev.parent);

	case TVM_I2C_SESSION_RELEASED:

	case TVM_IOMEM_LENT_NOTIFIED:

	case TVM_IRQ_LENT_NOTIFIED:

	case TVM_ALL_RESOURCES_LENT_NOTIFIED:

	case TRUSTED_TOUCH_TVM_INIT:

	case TVM_IRQ_LENT_NOTIFIED:

	case TVM_IOMEM_LENT_NOTIFIED:

		atomic_set(&info->trusted_touch_enabled, 0);

	}

drivers/input/touchscreen/st/fts.h

+1 −1
Original line number Diff line number Diff line
@@ -246,8 +246,8 @@ enum trusted_touch_tvm_states { 
	TVM_INTERRUPT_ENABLED,

	TVM_INTERRUPT_DISABLED,

	TVM_IRQ_RELEASED,

	TVM_IOMEM_RELEASED,

	TVM_I2C_SESSION_RELEASED,

	TVM_IOMEM_RELEASED,

	TRUSTED_TOUCH_TVM_STATE_MAX

};