drm: merge Linux master into HEAD

Conflicts:
	drivers/gpu/drm/drm_info.c
	drivers/gpu/drm/drm_proc.c
	drivers/gpu/drm/i915/i915_gem_debugfs.c

8 files changed, 82 insertions, 49 deletions

diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c
index f45f6116c77a..36c27c832360 100644
--- a/sound/isa/gus/gus_dma.c
+++ b/sound/isa/gus/gus_dma.c
@@ -45,7 +45,8 @@ static void snd_gf1_dma_program(struct snd_gus_card * gus,
         unsigned char dma_cmd;
         unsigned int address_high;
 
-        // snd_printk("dma_transfer: addr=0x%x, buf=0x%lx, count=0x%x\n", addr, (long) buf, count);
+        snd_printdd("dma_transfer: addr=0x%x, buf=0x%lx, count=0x%x\n",
+                    addr, buf_addr, count);
 
         if (gus->gf1.dma1 > 3) {
                 if (gus->gf1.enh_mode) {
@@ -77,7 +78,8 @@ static void snd_gf1_dma_program(struct snd_gus_card * gus,
         snd_gf1_dma_ack(gus);
         snd_dma_program(gus->gf1.dma1, buf_addr, count, dma_cmd & SNDRV_GF1_DMA_READ ? DMA_MODE_READ : DMA_MODE_WRITE);
 #if 0
-        snd_printk("address = 0x%x, count = 0x%x, dma_cmd = 0x%x\n", address << 1, count, dma_cmd);
+        snd_printk(KERN_DEBUG "address = 0x%x, count = 0x%x, dma_cmd = 0x%x\n",
+                   address << 1, count, dma_cmd);
 #endif
         spin_lock_irqsave(&gus->reg_lock, flags);
         if (gus->gf1.enh_mode) {
@@ -142,7 +144,9 @@ static void snd_gf1_dma_interrupt(struct snd_gus_card * gus)
         snd_gf1_dma_program(gus, block->addr, block->buf_addr, block->count, (unsigned short) block->cmd);
         kfree(block);
 #if 0
-        printk("program dma (IRQ) - addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n", addr, (long) buffer, count, cmd);
+        snd_printd(KERN_DEBUG "program dma (IRQ) - "
+                   "addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n",
+                   block->addr, block->buf_addr, block->count, block->cmd);
 #endif
 }
 
@@ -203,13 +207,16 @@ int snd_gf1_dma_transfer_block(struct snd_gus_card * gus,
         }
         *block = *__block;
         block->next = NULL;
-#if 0
-        printk("addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n", block->addr, (long) block->buffer, block->count, block->cmd);
-#endif
-#if 0
-        printk("gus->gf1.dma_data_pcm_last = 0x%lx\n", (long)gus->gf1.dma_data_pcm_last);
-        printk("gus->gf1.dma_data_pcm = 0x%lx\n", (long)gus->gf1.dma_data_pcm);
-#endif
+
+        snd_printdd("addr = 0x%x, buffer = 0x%lx, count = 0x%x, cmd = 0x%x\n",
+                    block->addr, (long) block->buffer, block->count,
+                    block->cmd);
+
+        snd_printdd("gus->gf1.dma_data_pcm_last = 0x%lx\n",
+                    (long)gus->gf1.dma_data_pcm_last);
+        snd_printdd("gus->gf1.dma_data_pcm = 0x%lx\n",
+                    (long)gus->gf1.dma_data_pcm);
+
         spin_lock_irqsave(&gus->dma_lock, flags);
         if (synth) {
                 if (gus->gf1.dma_data_synth_last) {
diff --git a/sound/isa/gus/gus_irq.c b/sound/isa/gus/gus_irq.c
index 041894ddd014..2055aff71b50 100644
--- a/sound/isa/gus/gus_irq.c
+++ b/sound/isa/gus/gus_irq.c
@@ -41,7 +41,7 @@ __again:
         if (status == 0)
                 return IRQ_RETVAL(handled);
         handled = 1;
-        // snd_printk("IRQ: status = 0x%x\n", status);
+        /* snd_printk(KERN_DEBUG "IRQ: status = 0x%x\n", status); */
         if (status & 0x02) {
                 STAT_ADD(gus->gf1.interrupt_stat_midi_in);
                 if (gus->gf1.interrupt_handler_midi_in)
@@ -65,7 +65,9 @@ __again:
                                 continue;       /* multi request */
                         already |= _current_;   /* mark request */
 #if 0
-                        printk("voice = %i, voice_status = 0x%x, voice_verify = %i\n", voice, voice_status, inb(GUSP(gus, GF1PAGE)));
+                        printk(KERN_DEBUG "voice = %i, voice_status = 0x%x, "
+                               "voice_verify = %i\n",
+                               voice, voice_status, inb(GUSP(gus, GF1PAGE)));
 #endif
                         pvoice = &gus->gf1.voices[voice]; 
                         if (pvoice->use) {
diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index 38510aeb21c6..edb11eefdfe3 100644
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -82,7 +82,10 @@ static int snd_gf1_pcm_block_change(struct snd_pcm_substream *substream,
 
         count += offset & 31;
         offset &= ~31;
-        // snd_printk("block change - offset = 0x%x, count = 0x%x\n", offset, count);
+        /*
+        snd_printk(KERN_DEBUG "block change - offset = 0x%x, count = 0x%x\n",
+                   offset, count);
+        */
         memset(&block, 0, sizeof(block));
         block.cmd = SNDRV_GF1_DMA_IRQ;
         if (snd_pcm_format_unsigned(runtime->format))
@@ -135,7 +138,11 @@ static void snd_gf1_pcm_trigger_up(struct snd_pcm_substream *substream)
                 curr = begin + (pcmp->bpos * pcmp->block_size) / runtime->channels;
                 end = curr + (pcmp->block_size / runtime->channels);
                 end -= snd_pcm_format_width(runtime->format) == 16 ? 2 : 1;
-                // snd_printk("init: curr=0x%x, begin=0x%x, end=0x%x, ctrl=0x%x, ramp=0x%x, rate=0x%x\n", curr, begin, end, voice_ctrl, ramp_ctrl, rate);
+                /*
+                snd_printk(KERN_DEBUG "init: curr=0x%x, begin=0x%x, end=0x%x, "
+                           "ctrl=0x%x, ramp=0x%x, rate=0x%x\n",
+                           curr, begin, end, voice_ctrl, ramp_ctrl, rate);
+                */
                 pan = runtime->channels == 2 ? (!voice ? 1 : 14) : 8;
                 vol = !voice ? gus->gf1.pcm_volume_level_left : gus->gf1.pcm_volume_level_right;
                 spin_lock_irqsave(&gus->reg_lock, flags);
@@ -205,9 +212,11 @@ static void snd_gf1_pcm_interrupt_wave(struct snd_gus_card * gus,
         ramp_ctrl = (snd_gf1_read8(gus, SNDRV_GF1_VB_VOLUME_CONTROL) & ~0xa4) | 0x03;
 #if 0
         snd_gf1_select_voice(gus, pvoice->number);
-        printk("position = 0x%x\n", (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
+        printk(KERN_DEBUG "position = 0x%x\n",
+               (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
         snd_gf1_select_voice(gus, pcmp->pvoices[1]->number);
-        printk("position = 0x%x\n", (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
+        printk(KERN_DEBUG "position = 0x%x\n",
+               (snd_gf1_read_addr(gus, SNDRV_GF1_VA_CURRENT, voice_ctrl & 4) >> 4));
         snd_gf1_select_voice(gus, pvoice->number);
 #endif
         pcmp->bpos++;
@@ -299,7 +308,11 @@ static int snd_gf1_pcm_poke_block(struct snd_gus_card *gus, unsigned char *buf,
         unsigned int len;
         unsigned long flags;
 
-        // printk("poke block; buf = 0x%x, pos = %i, count = %i, port = 0x%x\n", (int)buf, pos, count, gus->gf1.port);
+        /*
+        printk(KERN_DEBUG
+               "poke block; buf = 0x%x, pos = %i, count = %i, port = 0x%x\n",
+               (int)buf, pos, count, gus->gf1.port);
+        */
         while (count > 0) {
                 len = count;
                 if (len > 512)          /* limit, to allow IRQ */
@@ -680,7 +693,8 @@ static int snd_gf1_pcm_playback_open(struct snd_pcm_substream *substream)
         runtime->private_free = snd_gf1_pcm_playback_free;
 
 #if 0
-        printk("playback.buffer = 0x%lx, gf1.pcm_buffer = 0x%lx\n", (long) pcm->playback.buffer, (long) gus->gf1.pcm_buffer);
+        printk(KERN_DEBUG "playback.buffer = 0x%lx, gf1.pcm_buffer = 0x%lx\n",
+               (long) pcm->playback.buffer, (long) gus->gf1.pcm_buffer);
 #endif
         if ((err = snd_gf1_dma_init(gus)) < 0)
                 return err;
diff --git a/sound/isa/gus/gus_uart.c b/sound/isa/gus/gus_uart.c
index f0af3f79b08b..21cc42e4c4be 100644
--- a/sound/isa/gus/gus_uart.c
+++ b/sound/isa/gus/gus_uart.c
@@ -129,8 +129,14 @@ static int snd_gf1_uart_input_open(struct snd_rawmidi_substream *substream)
         }
         spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
 #if 0
-        snd_printk("read init - enable = %i, cmd = 0x%x, stat = 0x%x\n", gus->uart_enable, gus->gf1.uart_cmd, snd_gf1_uart_stat(gus));
-        snd_printk("[0x%x] reg (ctrl/status) = 0x%x, reg (data) = 0x%x (page = 0x%x)\n", gus->gf1.port + 0x100, inb(gus->gf1.port + 0x100), inb(gus->gf1.port + 0x101), inb(gus->gf1.port + 0x102));
+        snd_printk(KERN_DEBUG
+                   "read init - enable = %i, cmd = 0x%x, stat = 0x%x\n",
+                   gus->uart_enable, gus->gf1.uart_cmd, snd_gf1_uart_stat(gus));
+        snd_printk(KERN_DEBUG
+                   "[0x%x] reg (ctrl/status) = 0x%x, reg (data) = 0x%x "
+                   "(page = 0x%x)\n",
+                   gus->gf1.port + 0x100, inb(gus->gf1.port + 0x100),
+                   inb(gus->gf1.port + 0x101), inb(gus->gf1.port + 0x102));
 #endif
         return 0;
 }
diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c
index 426532a4d730..086b8f0e0f94 100644
--- a/sound/isa/gus/gusclassic.c
+++ b/sound/isa/gus/gusclassic.c
@@ -148,9 +148,9 @@ static int __devinit snd_gusclassic_probe(struct device *dev, unsigned int n)
         struct snd_gus_card *gus;
         int error;
 
-        card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
-        if (!card)
-                return -EINVAL;
+        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
+        if (error < 0)
+                return error;
 
         if (pcm_channels[n] < 2)
                 pcm_channels[n] = 2;
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 7ad4c3b41a84..180a8dea6bd9 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -241,9 +241,9 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
         struct snd_opl3 *opl3;
         int error;
 
-        card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
-        if (!card)
-                return -EINVAL;
+        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
+        if (error < 0)
+                return error;
 
         if (mpu_port[n] == SNDRV_AUTO_PORT)
                 mpu_port[n] = 0;
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index f94c1976e632..f26eac8d8110 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -214,10 +214,10 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
         struct snd_wss *wss;
         struct snd_gusmax *maxcard;
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_gusmax));
-        if (card == NULL)
-                return -ENOMEM;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct snd_gusmax), &card);
+        if (err < 0)
+                return err;
         card->private_free = snd_gusmax_free;
         maxcard = (struct snd_gusmax *)card->private_data;
         maxcard->card = card;
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index 5faecfb602d3..534a6eced2b8 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -170,7 +170,7 @@ static void snd_interwave_i2c_setlines(struct snd_i2c_bus *bus, int ctrl, int da
         unsigned long port = bus->private_value;
 
 #if 0
-        printk("i2c_setlines - 0x%lx <- %i,%i\n", port, ctrl, data);
+        printk(KERN_DEBUG "i2c_setlines - 0x%lx <- %i,%i\n", port, ctrl, data);
 #endif
         outb((data << 1) | ctrl, port);
         udelay(10);
@@ -183,7 +183,7 @@ static int snd_interwave_i2c_getclockline(struct snd_i2c_bus *bus)
 
         res = inb(port) & 1;
 #if 0
-        printk("i2c_getclockline - 0x%lx -> %i\n", port, res);
+        printk(KERN_DEBUG "i2c_getclockline - 0x%lx -> %i\n", port, res);
 #endif
         return res;
 }
@@ -197,7 +197,7 @@ static int snd_interwave_i2c_getdataline(struct snd_i2c_bus *bus, int ack)
                 udelay(10);
         res = (inb(port) & 2) >> 1;
 #if 0
-        printk("i2c_getdataline - 0x%lx -> %i\n", port, res);
+        printk(KERN_DEBUG "i2c_getdataline - 0x%lx -> %i\n", port, res);
 #endif
         return res;
 }
@@ -342,7 +342,8 @@ static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *s
                         snd_gf1_poke(gus, local, d);
                         snd_gf1_poke(gus, local + 1, d + 1);
 #if 0
-                        printk("d = 0x%x, local = 0x%x, local + 1 = 0x%x, idx << 22 = 0x%x\n",
+                        printk(KERN_DEBUG "d = 0x%x, local = 0x%x, "
+                               "local + 1 = 0x%x, idx << 22 = 0x%x\n",
                                d,
                                snd_gf1_peek(gus, local),
                                snd_gf1_peek(gus, local + 1),
@@ -356,7 +357,8 @@ static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *s
                 }
         }
 #if 0
-        printk("sizes: %i %i %i %i\n", sizes[0], sizes[1], sizes[2], sizes[3]);
+        printk(KERN_DEBUG "sizes: %i %i %i %i\n",
+               sizes[0], sizes[1], sizes[2], sizes[3]);
 #endif
 }
 
@@ -410,12 +412,12 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)
                 lmct = (psizes[3] << 24) | (psizes[2] << 16) |
                     (psizes[1] << 8) | psizes[0];
 #if 0
-                printk("lmct = 0x%08x\n", lmct);
+                printk(KERN_DEBUG "lmct = 0x%08x\n", lmct);
 #endif
                 for (i = 0; i < ARRAY_SIZE(lmc); i++)
                         if (lmct == lmc[i]) {
 #if 0
-                                printk("found !!! %i\n", i);
+                                printk(KERN_DEBUG "found !!! %i\n", i);
 #endif
                                 snd_gf1_write16(gus, SNDRV_GF1_GW_MEMORY_CONFIG, (snd_gf1_look16(gus, SNDRV_GF1_GW_MEMORY_CONFIG) & 0xfff0) | i);
                                 snd_interwave_bank_sizes(gus, psizes);
@@ -626,20 +628,22 @@ static void snd_interwave_free(struct snd_card *card)
                 free_irq(iwcard->irq, (void *)iwcard);
 }
 
-static struct snd_card *snd_interwave_card_new(int dev)
+static int snd_interwave_card_new(int dev, struct snd_card **cardp)
 {
         struct snd_card *card;
         struct snd_interwave *iwcard;
+        int err;
 
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
-                            sizeof(struct snd_interwave));
-        if (card == NULL)
-                return NULL;
+        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+                              sizeof(struct snd_interwave), &card);
+        if (err < 0)
+                return err;
         iwcard = card->private_data;
         iwcard->card = card;
         iwcard->irq = -1;
         card->private_free = snd_interwave_free;
-        return card;
+        *cardp = card;
+        return 0;
 }
 
 static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
@@ -778,9 +782,9 @@ static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr)
         struct snd_card *card;
         int err;
 
-        card = snd_interwave_card_new(dev);
-        if (! card)
-                return -ENOMEM;
+        err = snd_interwave_card_new(dev, &card);
+        if (err < 0)
+                return err;
 
         snd_card_set_dev(card, devptr);
         if ((err = snd_interwave_probe(card, dev)) < 0) {
@@ -876,9 +880,9 @@ static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,
         if (dev >= SNDRV_CARDS)
                 return -ENODEV;
                                 
-        card = snd_interwave_card_new(dev);
-        if (! card)
-                return -ENOMEM;
+        res = snd_interwave_card_new(dev, &card);
+        if (res < 0)
+                return res;
 
         if ((res = snd_interwave_pnp(dev, card->private_data, pcard, pid)) < 0) {
                 snd_card_free(card);