i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to detect whether the stream's DMA position is broken and switch to using

Browse Source 
the LPIB, if it is.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34684 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-12-16 20:39:54 +00:00
parent 9c3ad4fbb0
commit f887c7059e
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/hda/driver.h
+3
View File
@@ -164,6 +164,9 @@ struct hda_stream {
area_id buffer_descriptors_area; area_id buffer_descriptors_area;
uint32 physical_buffer_descriptors; /* BDL physical address */ uint32 physical_buffer_descriptors; /* BDL physical address */
int32 incorrect_position_count;
bool use_dma_position;
uint8 Read8(uint32 reg) uint8 Read8(uint32 reg)
{ {
return controller->Read8(HDAC_STREAM_BASE + offset + reg); return controller->Read8(HDAC_STREAM_BASE + offset + reg);
src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp
+23 -3
View File
@@ -111,12 +111,25 @@ stream_handle_interrupt(hda_controller* controller, hda_stream* stream,
return false; return false;
} }
// Normally we should use the DMA position for the stream. Apparently there
// are broken chipsets, which don't support it correctly. If we detect this,
// we switch to using the LPIB instead. The link position is ahead of the
// DMA position for recording and behind for playback streams, but just
// for determining the currently active buffer, it should be good enough.
if (stream->use_dma_position && stream->incorrect_position_count >= 32) {
dprintf("hda: DMA position for stream (id:%ld) seems to be broken. "
"Switching to using LPIB.\n", stream->id);
stream->use_dma_position = false;
}
// Determine the buffer we're switching to. Some chipsets seem to trigger // Determine the buffer we're switching to. Some chipsets seem to trigger
// the interrupt before the DMA position in memory has been updated. We // the interrupt before the DMA position in memory has been updated. We
// round it, so we still get the right buffer. // round it, so we still get the right buffer.
uint32 dmaPosition = controller->stream_positions[index * 2]; uint32 dmaPosition = stream->use_dma_position
uint32 bufferIndex = (dmaPosition + stream->buffer_size / 2) ? controller->stream_positions[index * 2]
/ stream->buffer_size; : stream->Read32(HDAC_STREAM_POSITION);
uint32 bufferIndex = ((dmaPosition + stream->buffer_size / 2)
/ stream->buffer_size) % stream->num_buffers;
// get the current recording/playing position and the system time // get the current recording/playing position and the system time
uint32 linkBytePosition = stream->Read32(HDAC_STREAM_POSITION); uint32 linkBytePosition = stream->Read32(HDAC_STREAM_POSITION);
@@ -142,6 +155,11 @@ stream_handle_interrupt(hda_controller* controller, hda_stream* stream,
// update stream playing/recording state and notify buffer_exchange() // update stream playing/recording state and notify buffer_exchange()
acquire_spinlock(&stream->lock); acquire_spinlock(&stream->lock);
if (bufferIndex == (stream->buffer_cycle + 1) % stream->num_buffers)
stream->incorrect_position_count = 0;
else
stream->incorrect_position_count++;
stream->real_time = now; stream->real_time = now;
stream->frames_count += framesProcessed; stream->frames_count += framesProcessed;
stream->buffer_cycle = bufferIndex; stream->buffer_cycle = bufferIndex;
@@ -464,6 +482,8 @@ hda_stream_new(hda_audio_group* audioGroup, int type)
stream->type = type; stream->type = type;
stream->controller = controller; stream->controller = controller;
stream->warn_count = 0; stream->warn_count = 0;
stream->incorrect_position_count = 0;
stream->use_dma_position = true;
switch (type) { switch (type) {
case STREAM_PLAYBACK: case STREAM_PLAYBACK: