Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux...

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/gr: disable fifo access and idle before suspend ctx unload
  drm/nouveau: pass flag to engine fini() method on suspend
  drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing
  drm/nv40/gr: rewrite/split context takedown functions
  drm/nouveau: detect disabled device in irq handler and return IRQ_NONE
  drm/nouveau: ignore connector type when deciding digital/analog on DVI-I
  drm/nouveau: Add a quirk for Gigabyte NX86T
  drm/nouveau: do not leak in nv20_graph_create
  drm/nv50/dp: fix hack to work for macbooks booted via EFI

diff --combined drivers/gpu/drm/nouveau/nouveau_state.c
index fa1e63210040a44c37c63233fb73bd61d5b7f00c,c7d87bc1e93602addcf937f77229e95c4f8d20e0..10656e430b44106f26497beb648e19dca9226994
--- 1/drivers/gpu/drm/nouveau/nouveau_state.c
--- 2/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@@ -377,6 -377,7 +377,6 @@@ static int nouveau_init_engine_ptrs(str
                engine->vram.flags_valid        = nv50_vram_flags_valid;
                break;
        case 0xC0:
 -      case 0xD0:
                engine->instmem.init            = nvc0_instmem_init;
                engine->instmem.takedown        = nvc0_instmem_takedown;
                engine->instmem.suspend         = nvc0_instmem_suspend;
@@@ -694,7 -695,7 +694,7 @@@ out_engine
                for (e = e - 1; e >= 0; e--) {
                        if (!dev_priv->eng[e])
                                continue;
-                       dev_priv->eng[e]->fini(dev, e);
+                       dev_priv->eng[e]->fini(dev, e, false);
                        dev_priv->eng[e]->destroy(dev,e );
                }
        }
@@@ -746,7 -747,7 +746,7 @@@ static void nouveau_card_takedown(struc
                engine->fifo.takedown(dev);
                for (e = NVOBJ_ENGINE_NR - 1; e >= 0; e--) {
                        if (dev_priv->eng[e]) {
-                               dev_priv->eng[e]->fini(dev, e);
+                               dev_priv->eng[e]->fini(dev, e, false);
                                dev_priv->eng[e]->destroy(dev,e );
                        }
                }
@@@ -985,6 -986,7 +985,6 @@@ int nouveau_load(struct drm_device *dev
                dev_priv->card_type = NV_50;
                break;
        case 0xc0:
 -      case 0xd0:
                dev_priv->card_type = NV_C0;
                break;
        default:
@@@ -1109,7 -1111,7 +1109,7 @@@ int nouveau_ioctl_getparam(struct drm_d
        case NOUVEAU_GETPARAM_BUS_TYPE:
                if (drm_pci_device_is_agp(dev))
                        getparam->value = NV_AGP;
 -              else if (drm_pci_device_is_pcie(dev))
 +              else if (pci_is_pcie(dev->pdev))
                        getparam->value = NV_PCIE;
                else
                        getparam->value = NV_PCI;