mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arjan van de Ven <arjanv@redhat.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: Johannes Stezenbach <js@convergence.de>, linux-kernel@vger.kernel.org
Subject: Re: 2.6.1-mm4: ALSA es1968 DMA alloc problem
Date: Mon, 19 Jan 2004 18:05:54 +0100	[thread overview]
Message-ID: <1074531954.4443.6.camel@laptop.fenrus.com> (raw)
In-Reply-To: <s5hwu7n6gvz.wl@alsa2.suse.de>

[-- Attachment #1: Type: text/plain, Size: 1911 bytes --]

On Mon, 2004-01-19 at 17:29, Takashi Iwai wrote:
> --- linux/sound/core/memalloc.c	15 Jan 2004 16:17:36 -0000	1.20
> +++ linux/sound/core/memalloc.c	19 Jan 2004 11:52:21 -0000
> @@ -841,10 +844,11 @@
>  			continue;
>  		}
>  			
> -		if (pci_set_consistent_dma_mask(pci, dev->dma_mask) < 0) {
> +		if (pci_set_dma_mask(pci, dev->dma_mask) < 0) {
>  			printk(KERN_ERR "snd-page-alloc: cannot set DMA mask %lx for pci %04x:%04x\n", dev->dma_mask, dev->vendor, dev->device);
>  			continue;
>  		}
> +		pci_set_consistent_dma_mask(pci, dev->dma_mask);
>  		for (i = 0; i < dev->buffers; i++) {
>  			struct snd_mem_list *mem;
>  			mem = kmalloc(sizeof(*mem), GFP_KERNEL);

unchecked 


> --- linux/sound/pci/emu10k1/emu10k1_main.c	2 Jan 2004 13:39:33 -0000	1.27
> +++ linux/sound/pci/emu10k1/emu10k1_main.c	19 Jan 2004 11:47:55 -0000
> @@ -599,11 +599,12 @@
>  		return -ENOMEM;
>  	/* set the DMA transfer mask */
>  	emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;
> -	if (pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) {
> +	if (pci_set_dma_mask(pci, emu->dma_mask)) {
>  		snd_printk(KERN_ERR "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask);
>  		snd_magic_kfree(emu);
>  		return -ENXIO;
>  	}
> +	pci_set_consistent_dma_mask(pci, emu->dma_mask);
>  	emu->card = card;
>  	spin_lock_init(&emu->reg_lock);
>  	spin_lock_init(&emu->emu_lock);

unchecked
> --- linux/sound/pci/trident/trident_main.c	20 Nov 2003 12:03:01 -0000	1.43
> +++ linux/sound/pci/trident/trident_main.c	19 Jan 2004 11:48:59 -0000
> @@ -3952,6 +3952,7 @@
>  		return;
>  
>  	pci_enable_device(trident->pci);
> +	pci_set_dma_mask(trident->pci, 0x3fffffff); /* FIXME: correct? */
>  	pci_set_consistent_dma_mask(trident->pci, 0x3fffffff); /* FIXME: correct? */
>  	pci_set_master(trident->pci); /* to be sure */
>  

unchecked


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

  parent reply	other threads:[~2004-01-19 17:06 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-01-17 16:10 Johannes Stezenbach
2004-01-19 16:29 ` Takashi Iwai
2004-01-19 16:43   ` Arjan van de Ven
2004-01-19 16:56     ` Takashi Iwai
2004-01-19 17:05   ` Arjan van de Ven [this message]
2004-01-19 17:14     ` Takashi Iwai
2004-01-19 18:05       ` Takashi Iwai
2004-01-20  1:17         ` Johannes Stezenbach

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1074531954.4443.6.camel@laptop.fenrus.com \
    --to=arjanv@redhat.com \
    --cc=js@convergence.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®