From patchwork Tue Oct 25 14:53:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 121713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 729A51007DC for ; Wed, 26 Oct 2011 01:53:31 +1100 (EST) Received: from localhost ([::1]:42160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIiNc-0007zX-9X for incoming@patchwork.ozlabs.org; Tue, 25 Oct 2011 10:53:28 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIiNW-0007z0-Mu for qemu-devel@nongnu.org; Tue, 25 Oct 2011 10:53:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RIiNV-0003S9-MK for qemu-devel@nongnu.org; Tue, 25 Oct 2011 10:53:22 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:58152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RIiNV-0003Rw-Hw for qemu-devel@nongnu.org; Tue, 25 Oct 2011 10:53:21 -0400 Received: by wyh15 with SMTP id 15so667218wyh.4 for ; Tue, 25 Oct 2011 07:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=/74dzp0a3t4E3s+o4LFdlEMAS8H9urmUq9MRc6WWVP8=; b=AL3YxjrWYCV+Ct+ITFwI7NKwM8fXaT5zu4pqLv07oUfxY68hzTiS0fg1x+rDPiHyXY +orF6RknifF4R7KLfpK+82rAlSiqU9+DQX0VmWnI8VTjHUYR8rXp0Sa2lOprpon9HYst KOxkY98h4iy4oIzfO6+PDW7KDUtk+Fj0avdfU= Received: by 10.227.197.81 with SMTP id ej17mr4018478wbb.13.1319554400255; Tue, 25 Oct 2011 07:53:20 -0700 (PDT) Received: from localhost (APoitiers-651-1-50-239.w86-207.abo.wanadoo.fr. [86.207.189.239]) by mx.google.com with ESMTPS id h9sm3775404wbp.14.2011.10.25.07.53.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Oct 2011 07:53:18 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Tue, 25 Oct 2011 16:53:00 +0200 Message-Id: <1319554381-26230-1-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.6.2 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com Subject: [Qemu-devel] [PATCH 1/2] hda: do not mix output and input streams, RHBZ #740493 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Windows 7 may use the same stream number for input and output. That will result in lot of garbage on playback. The hardcoded value of 4 needs to be in sync with GCAP streams description and IN/OUT registers. Signed-off-by: Marc-André Lureau --- hw/intel-hda.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/intel-hda.c b/hw/intel-hda.c index 4272204..c6a3fec 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -389,14 +389,15 @@ static bool intel_hda_xfer(HDACodecDevice *dev, uint32_t stnr, bool output, { HDACodecBus *bus = DO_UPCAST(HDACodecBus, qbus, dev->qdev.parent_bus); IntelHDAState *d = container_of(bus, IntelHDAState, codecs); - IntelHDAStream *st = NULL; target_phys_addr_t addr; uint32_t s, copy, left; + IntelHDAStream *st; bool irq = false; - for (s = 0; s < ARRAY_SIZE(d->st); s++) { - if (stnr == ((d->st[s].ctl >> 20) & 0x0f)) { - st = d->st + s; + st = output ? d->st + 4 : d->st; + for (s = 0; s < 4; s++) { + if (stnr == ((st[s].ctl >> 20) & 0x0f)) { + st = st + s; break; } }