Merge commit alsa/devel into topic/misc (a29fb94f) · Commits · e / devices / android_kernel_fairphone_FP4

include/sound/pcm.h

+9 −1

Original line number	Diff line number	Diff line
		@@ -262,6 +262,8 @@ struct snd_pcm_hw_constraint_list {
		unsigned int mask;
		};

		struct snd_pcm_hwptr_log;

		struct snd_pcm_runtime {
		/* -- Status -- */
		struct snd_pcm_substream *trigger_master;
		@@ -269,7 +271,6 @@ struct snd_pcm_runtime {
		int overrange;
		snd_pcm_uframes_t avail_max;
		snd_pcm_uframes_t hw_ptr_base; /* Position at buffer restart */
		snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */
		unsigned long hw_ptr_jiffies; /* Time when hw_ptr is updated */
		snd_pcm_sframes_t delay; /* extra delay; typically FIFO size */

		@@ -310,6 +311,7 @@ struct snd_pcm_runtime {
		struct snd_pcm_mmap_control *control;

		/* -- locking / scheduling -- */
		unsigned int nowake: 1; /* no wakeup (data-copy in progress) */
		wait_queue_head_t sleep;
		struct fasync_struct *fasync;

		@@ -340,6 +342,10 @@ struct snd_pcm_runtime {
		/* -- OSS things -- */
		struct snd_pcm_oss_runtime oss;
		#endif

		#ifdef CONFIG_SND_PCM_XRUN_DEBUG
		struct snd_pcm_hwptr_log *hwptr_log;
		#endif
		};

		struct snd_pcm_group { /* keep linked substreams */
		@@ -834,6 +840,8 @@ void snd_pcm_set_sync(struct snd_pcm_substream *substream);
		int snd_pcm_lib_interleave_len(struct snd_pcm_substream *substream);
		int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream,
		unsigned int cmd, void *arg);
		int snd_pcm_update_state(struct snd_pcm_substream *substream,
		struct snd_pcm_runtime *runtime);
		int snd_pcm_update_hw_ptr(struct snd_pcm_substream *substream);
		int snd_pcm_playback_xrun_check(struct snd_pcm_substream *substream);
		int snd_pcm_capture_xrun_check(struct snd_pcm_substream *substream);

include/sound/pcm_oss.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ struct snd_pcm_oss_runtime {
		struct snd_pcm_plugin *plugin_first;
		struct snd_pcm_plugin *plugin_last;
		#endif
		unsigned int prev_hw_ptr_interrupt;
		unsigned int prev_hw_ptr_period;
		};

		struct snd_pcm_oss_file {

include/sound/version.h

+1 −1

Original line number	Diff line number	Diff line
		/* include/version.h */
		#define CONFIG_SND_VERSION "1.0.22"
		#define CONFIG_SND_VERSION "1.0.22.1"
		#define CONFIG_SND_DATE ""

sound/core/oss/pcm_oss.c

+23 −9

Original line number	Diff line number	Diff line
		@@ -632,6 +632,13 @@ static long snd_pcm_alsa_frames(struct snd_pcm_substream *substream, long bytes)
		return bytes_to_frames(runtime, (buffer_size * bytes) / runtime->oss.buffer_bytes);
		}

		static inline
		snd_pcm_uframes_t get_hw_ptr_period(struct snd_pcm_runtime *runtime)
		{
		snd_pcm_uframes_t ptr = runtime->status->hw_ptr;
		return ptr - (ptr % runtime->period_size);
		}

		/* define extended formats in the recent OSS versions (if any) */
		/* linear formats */
		#define AFMT_S32_LE 0x00001000
		@@ -1102,7 +1109,7 @@ static int snd_pcm_oss_prepare(struct snd_pcm_substream *substream)
		return err;
		}
		runtime->oss.prepare = 0;
		runtime->oss.prev_hw_ptr_interrupt = 0;
		runtime->oss.prev_hw_ptr_period = 0;
		runtime->oss.period_ptr = 0;
		runtime->oss.buffer_used = 0;

		@@ -1950,7 +1957,8 @@ static int snd_pcm_oss_get_caps(struct snd_pcm_oss_file *pcm_oss_file)
		return result;
		}

		static void snd_pcm_oss_simulate_fill(struct snd_pcm_substream *substream, snd_pcm_uframes_t hw_ptr)
		static void snd_pcm_oss_simulate_fill(struct snd_pcm_substream *substream,
		snd_pcm_uframes_t hw_ptr)
		{
		struct snd_pcm_runtime *runtime = substream->runtime;
		snd_pcm_uframes_t appl_ptr;
		@@ -1986,7 +1994,8 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr
		if (runtime->oss.trigger)
		goto _skip1;
		if (atomic_read(&psubstream->mmap_count))
		snd_pcm_oss_simulate_fill(psubstream, runtime->hw_ptr_interrupt);
		snd_pcm_oss_simulate_fill(psubstream,
		get_hw_ptr_period(runtime));
		runtime->oss.trigger = 1;
		runtime->start_threshold = 1;
		cmd = SNDRV_PCM_IOCTL_START;
		@@ -2105,11 +2114,12 @@ static int snd_pcm_oss_get_ptr(struct snd_pcm_oss_file *pcm_oss_file, int stream
		info.ptr = snd_pcm_oss_bytes(substream, runtime->status->hw_ptr % runtime->buffer_size);
		if (atomic_read(&substream->mmap_count)) {
		snd_pcm_sframes_t n;
		n = (delay = runtime->hw_ptr_interrupt) - runtime->oss.prev_hw_ptr_interrupt;
		delay = get_hw_ptr_period(runtime);
		n = delay - runtime->oss.prev_hw_ptr_period;
		if (n < 0)
		n += runtime->boundary;
		info.blocks = n / runtime->period_size;
		runtime->oss.prev_hw_ptr_interrupt = delay;
		runtime->oss.prev_hw_ptr_period = delay;
		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
		snd_pcm_oss_simulate_fill(substream, delay);
		info.bytes = snd_pcm_oss_bytes(substream, runtime->status->hw_ptr) & INT_MAX;
		@@ -2673,18 +2683,22 @@ static int snd_pcm_oss_playback_ready(struct snd_pcm_substream *substream)
		{
		struct snd_pcm_runtime *runtime = substream->runtime;
		if (atomic_read(&substream->mmap_count))
		return runtime->oss.prev_hw_ptr_interrupt != runtime->hw_ptr_interrupt;
		return runtime->oss.prev_hw_ptr_period !=
		get_hw_ptr_period(runtime);
		else
		return snd_pcm_playback_avail(runtime) >= runtime->oss.period_frames;
		return snd_pcm_playback_avail(runtime) >=
		runtime->oss.period_frames;
		}

		static int snd_pcm_oss_capture_ready(struct snd_pcm_substream *substream)
		{
		struct snd_pcm_runtime *runtime = substream->runtime;
		if (atomic_read(&substream->mmap_count))
		return runtime->oss.prev_hw_ptr_interrupt != runtime->hw_ptr_interrupt;
		return runtime->oss.prev_hw_ptr_period !=
		get_hw_ptr_period(runtime);
		else
		return snd_pcm_capture_avail(runtime) >= runtime->oss.period_frames;
		return snd_pcm_capture_avail(runtime) >=
		runtime->oss.period_frames;
		}

		static unsigned int snd_pcm_oss_poll(struct file file, poll_table wait)

sound/core/pcm.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -921,6 +921,10 @@ void snd_pcm_detach_substream(struct snd_pcm_substream *substream)
		snd_free_pages((void*)runtime->control,
		PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control)));
		kfree(runtime->hw_constraints.rules);
		#ifdef CONFIG_SND_PCM_XRUN_DEBUG
		if (runtime->hwptr_log)
		kfree(runtime->hwptr_log);
		#endif
		kfree(runtime);
		substream->runtime = NULL;
		put_pid(substream->pid);