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

Commit 5596c609 authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy Committed by Gerrit - the friendly Code Review server
Browse files

leds: qpnp-haptics: Allow duration for buffer mode 



Currently, duration is not allowed to be set while playing the
pattern in buffer mode. This works fine. However when playing
multiple sample sets, the last sample set might be stopped early
as the play interrupt fires immediately after configuring the
new sample set. Fix this by calculating the duration based on the
wave samples configured and the play rate.

Change-Id: I67b1741d435e07bf7332f7e36231fefa9129a9a6
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
Signed-off-by: default avatarShilpa Suresh <sbsure@codeaurora.org>
parent 7acdf203

drivers/leds/leds-qpnp-haptics.c

+33 −20
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ struct hap_lra_ares_param { 
 *  @ last_rate_cfg - Last rate config updated

 *  @ wave_rep_cnt - waveform repeat count

 *  @ wave_s_rep_cnt - waveform sample repeat count

 *  @ wf_samp_len - waveform sample length

 *  @ ext_pwm_freq_khz - external pwm frequency in KHz

 *  @ ext_pwm_dtest_line - DTEST line for external pwm

 *  @ status_flags - status
@@ -330,6 +331,7 @@ struct hap_chip { 
	u16				last_rate_cfg;

	u32				wave_rep_cnt;

	u32				wave_s_rep_cnt;

	u32				wf_samp_len;

	u32				ext_pwm_freq_khz;

	u8				ext_pwm_dtest_line;

	u32				status_flags;
@@ -445,6 +447,19 @@ out: 
	return rc;

}



static inline int get_buffer_mode_duration(struct hap_chip *chip)

{

	int sample_count, sample_duration;



	sample_count = chip->wave_rep_cnt * chip->wave_s_rep_cnt *

			chip->wf_samp_len;

	sample_duration = sample_count * chip->wave_play_rate_us;

	pr_debug("sample_count: %d sample_duration: %d\n", sample_count,

		sample_duration);



	return (sample_duration / 1000);

}



static bool is_sw_lra_auto_resonance_control(struct hap_chip *chip)

{

	if (chip->act_type != HAP_LRA)
@@ -735,7 +750,8 @@ static int qpnp_haptics_play(struct hap_chip *chip, bool enable) 
			goto out;

		}



		if (chip->play_mode != HAP_BUFFER)

		if (chip->play_mode == HAP_BUFFER)

			time_ms = get_buffer_mode_duration(chip);

		hrtimer_start(&chip->stop_timer,

			ktime_set(time_ms / MSEC_PER_SEC,

			(time_ms % MSEC_PER_SEC) * NSEC_PER_MSEC),
@@ -766,6 +782,9 @@ static int qpnp_haptics_play(struct hap_chip *chip, bool enable) 


		if (chip->play_mode == HAP_PWM)

			pwm_disable(chip->pwm_data.pwm_dev);



		if (chip->play_mode == HAP_BUFFER)

			chip->wave_samp_idx = 0;

	}



out:
@@ -1182,8 +1201,11 @@ static int qpnp_haptics_auto_mode_config(struct hap_chip *chip, int time_ms) 
	if (time_ms <= 20) {

		wave_samp[0] = HAP_WF_SAMP_MAX;

		wave_samp[1] = HAP_WF_SAMP_MAX;

		if (time_ms > 15)

		chip->wf_samp_len = 2;

		if (time_ms > 15) {

			wave_samp[2] = HAP_WF_SAMP_MAX;

			chip->wf_samp_len = 3;

		}



		/* short pattern */

		rc = qpnp_haptics_parse_buffer_dt(chip);
@@ -1302,33 +1324,20 @@ static irqreturn_t qpnp_haptics_play_irq_handler(int irq, void *data) 
		chip->wave_samp_idx += HAP_WAVE_SAMP_LEN;

		if (chip->wave_samp_idx >= ARRAY_SIZE(chip->wave_samp)) {

			pr_debug("Samples over\n");

			/* fall through to stop playing */

		} else {

			pr_debug("moving to next sample set %d\n",

				chip->wave_samp_idx);



			/* Moving to next set of wave sample */

			rc = qpnp_haptics_buffer_config(chip, NULL, false);

			if (rc < 0) {

				pr_err("Error in configuring buffer, rc=%d\n",

					rc);

				goto irq_handled;

			}



			/*

			 * Moving to next set of wave sample. No need to stop

			 * or change the play control. Just return.

			 */

			goto irq_handled;

		}

	}



	rc = qpnp_haptics_play_control(chip, HAP_STOP);

	if (rc < 0) {

		pr_err("Error in disabling play, rc=%d\n", rc);

		goto irq_handled;

	}

	chip->wave_samp_idx = 0;



irq_handled:

	return IRQ_HANDLED;

}
@@ -1638,6 +1647,7 @@ static ssize_t qpnp_haptics_store_wf_samp(struct device *dev, 
		pos += bytes_read;

	}



	chip->wf_samp_len = i;

	for (i = 0; i < ARRAY_SIZE(chip->wave_samp); i++)

		chip->wave_samp[i] = samp[i];
@@ -1986,7 +1996,10 @@ static int qpnp_haptics_parse_buffer_dt(struct hap_chip *chip) 
		/* Use default values */

		for (i = 0; i < HAP_WAVE_SAMP_LEN; i++)

			chip->wave_samp[i] = HAP_WF_SAMP_MAX;



		wf_samp_len = HAP_WAVE_SAMP_LEN;

	}

	chip->wf_samp_len = wf_samp_len;



	return 0;

}