diff options
| author | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-04-29 16:48:47 +0400 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-05-20 08:49:21 +0200 |
| commit | a2554a334a92db72547a8d15e9d00dc3d37dd3a1 (patch) | |
| tree | aa076a401a38980b052db54e2cfb110b4993c49f /hw | |
| parent | c5fa6c86d0765f837515d1c10654c621724a77e0 (diff) | |
| download | qemu-a2554a334a92db72547a8d15e9d00dc3d37dd3a1.tar.gz qemu-a2554a334a92db72547a8d15e9d00dc3d37dd3a1.tar.bz2 qemu-a2554a334a92db72547a8d15e9d00dc3d37dd3a1.zip | |
audio/intel-hda: support FIFORDY
linux kernel 3.12 has changed intel-hda
driver to always check for FIFORDY, this
causes long hangs in guest since QEMU
always has this bit set to 0. We now simply set
it to 1 always, since we're synchronous anyway
and always ready to receive the stream
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/audio/intel-hda.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index d41f82cec4..9e075c0137 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -574,7 +574,7 @@ static void intel_hda_set_st_ctl(IntelHDAState *d, const IntelHDAReg *reg, uint3 if (st->ctl & 0x01) { /* reset */ dprint(d, 1, "st #%d: reset\n", reg->stream); - st->ctl = 0; + st->ctl = SD_STS_FIFO_READY << 24; } if ((st->ctl & 0x02) != (old & 0x02)) { uint32_t stnr = (st->ctl >> 20) & 0x0f; @@ -829,6 +829,7 @@ static const struct IntelHDAReg regtab[] = { .wclear = 0x1c000000, \ .offset = offsetof(IntelHDAState, st[_i].ctl), \ .whandler = intel_hda_set_st_ctl, \ + .reset = SD_STS_FIFO_READY << 24 \ }, \ [ ST_REG(_i, ICH6_REG_SD_LPIB) ] = { \ .stream = _i, \ |