2.4.15: fix for i810_audio problems under KDE
PATCH 1/1 2.4.15: fix for i810_audio problems under KDE
i810_audio doesn't work under KDE for 2.4.15 (realy already for a rather long time). I'm only getting garbled sound unless i810_audio.c is patched. Perhaps the reason is use of non blocked output by artsd.
Included patch reverts one change between 2.4.6-ac1 and 2.4.6-ac2 and also includes patch from Tobias Diedrich
( http://www.cs.helsinki.fi/linux/linux-kernel/2001-44/1023.html ). As far as I have tested it fixes all problems I have met with i810_audio.
Andris
i810_audio.c renamed from i810_audio.c~1 +5 -9
@@ -1405,10 +1405,9 @@if (dmabuf->count <0 ) { dmabuf->count =0 ; } - cnt = dmabuf->dmasize - dmabuf->fragsize - dmabuf->count; -// this is to make the copy_from_user simpler below -if (cnt > (dmabuf->dmasize - swptr)) - cnt = dmabuf->dmasize - swptr; + cnt = dmabuf->dmasize - swptr; +if (cnt > (dmabuf->dmasize - dmabuf->count)) + cnt = dmabuf->dmasize - dmabuf->count;spin_unlock_irqrestore (&state->card->lock, flags);#ifdef DEBUG2
@@ -1419,16 +1418,13 @@if (cnt <=0 ) {unsigned long tmo;// There is data waiting to be played +i810_update_lvi (state,0 );if (!dmabuf->enable && dmabuf->count) {/* force the starting incase SETTRIGGER has been used */ /* to stop it, otherwise this is a deadlock situation */ dmabuf->trigger |=PCM_ENABLE_OUTPUT ;start_dac (state); } -// Update the LVI pointer in case we have already -// written data in this syscall and are just waiting -// on the tail bit of data -i810_update_lvi (state,0 );if (file->f_flags &O_NONBLOCK ) {if (!ret) ret = -EAGAIN ; goto ret;
@@ -1860,7 +1856,7 @@if (dmabuf->mapped) abinfo.bytes = dmabuf->count;else - abinfo.bytes = dmabuf->dmasize - dmabuf->count; + abinfo.bytes = dmabuf->dmasize - dmabuf->fragsize - dmabuf->count; abinfo.fragments = abinfo.bytes / dmabuf->userfragsize;spin_unlock_irqrestore (&state->card->lock, flags);#ifdef DEBUG