Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / gpu / drm / nouveau / nv50_fb.c

diff --git a/drivers/gpu/drm/nouveau/nv50_fb.c b/drivers/gpu/drm/nouveau/nv50_fb.c
index cd1988b15d2c9f3c2318bd6eba07bf935e3086eb..50290dea0ac4ab0a89c9807e2132073e5c7db640 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_fb.c
+++ b/drivers/gpu/drm/nouveau/nv50_fb.c
@@ -3,30 +3,75 @@
 #include "nouveau_drv.h"
 #include "nouveau_drm.h"
 
+struct nv50_fb_priv {
+       struct page *r100c08_page;
+       dma_addr_t r100c08;
+};
+
+static int
+nv50_fb_create(struct drm_device *dev)
+{
+       struct drm_nouveau_private *dev_priv = dev->dev_private;
+       struct nv50_fb_priv *priv;
+
+       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+       if (!priv)
+               return -ENOMEM;
+
+       priv->r100c08_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+       if (!priv->r100c08_page) {
+               kfree(priv);
+               return -ENOMEM;
+       }
+
+       priv->r100c08 = pci_map_page(dev->pdev, priv->r100c08_page, 0,
+                                    PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+       if (pci_dma_mapping_error(dev->pdev, priv->r100c08)) {
+               __free_page(priv->r100c08_page);
+               kfree(priv);
+               return -EFAULT;
+       }
+
+       dev_priv->engine.fb.priv = priv;
+       return 0;
+}
+
 int
 nv50_fb_init(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+       struct nv50_fb_priv *priv;
+       int ret;
+
+       if (!dev_priv->engine.fb.priv) {
+               ret = nv50_fb_create(dev);
+               if (ret)
+                       return ret;
+       }
+       priv = dev_priv->engine.fb.priv;
 
        /* Not a clue what this is exactly.  Without pointing it at a
         * scratch page, VRAM->GART blits with M2MF (as in DDX DFS)
         * cause IOMMU "read from address 0" errors (rh#561267)
         */
-       nv_wr32(dev, 0x100c08, dev_priv->gart_info.sg_dummy_bus >> 8);
+       nv_wr32(dev, 0x100c08, priv->r100c08 >> 8);
 
        /* This is needed to get meaningful information from 100c90
         * on traps. No idea what these values mean exactly. */
        switch (dev_priv->chipset) {
        case 0x50:
-               nv_wr32(dev, 0x100c90, 0x0707ff);
+               nv_wr32(dev, 0x100c90, 0x000707ff);
                break;
        case 0xa3:
        case 0xa5:
        case 0xa8:
-               nv_wr32(dev, 0x100c90, 0x0d0fff);
+               nv_wr32(dev, 0x100c90, 0x000d0fff);
+               break;
+       case 0xaf:
+               nv_wr32(dev, 0x100c90, 0x089d1fff);
                break;
        default:
-               nv_wr32(dev, 0x100c90, 0x1d07ff);
+               nv_wr32(dev, 0x100c90, 0x001d07ff);
                break;
        }
 
@@ -36,12 +81,25 @@ nv50_fb_init(struct drm_device *dev)
 void
 nv50_fb_takedown(struct drm_device *dev)
 {
+       struct drm_nouveau_private *dev_priv = dev->dev_private;
+       struct nv50_fb_priv *priv;
+
+       priv = dev_priv->engine.fb.priv;
+       if (!priv)
+               return;
+       dev_priv->engine.fb.priv = NULL;
+
+       pci_unmap_page(dev->pdev, priv->r100c08, PAGE_SIZE,
+                      PCI_DMA_BIDIRECTIONAL);
+       __free_page(priv->r100c08_page);
+       kfree(priv);
 }
 
 void
 nv50_fb_vm_trap(struct drm_device *dev, int display, const char *name)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
+       unsigned long flags;
        u32 trap[6], idx, chinst;
        int i, ch;
 
@@ -60,8 +118,10 @@ nv50_fb_vm_trap(struct drm_device *dev, int display, const char *name)
                return;
 
        chinst = (trap[2] << 16) | trap[1];
+
+       spin_lock_irqsave(&dev_priv->channels.lock, flags);
        for (ch = 0; ch < dev_priv->engine.fifo.channels; ch++) {
-               struct nouveau_channel *chan = dev_priv->fifos[ch];
+               struct nouveau_channel *chan = dev_priv->channels.ptr[ch];
 
                if (!chan || !chan->ramin)
                        continue;
@@ -69,6 +129,7 @@ nv50_fb_vm_trap(struct drm_device *dev, int display, const char *name)
                if (chinst == chan->ramin->vinst >> 12)
                        break;
        }
+       spin_unlock_irqrestore(&dev_priv->channels.lock, flags);
 
        NV_INFO(dev, "%s - VM: Trapped %s at %02x%04x%04x status %08x "
                     "channel %d (0x%08x)\n",