• Dave Airlie's avatar
    Merge branch 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes · f6624888
    Dave Airlie authored
        - Fix BUG() on !SMP builds
        - Fix for OOPS on pre-NV50 that snuck into -next
        - MCP7[789A] hang fix where firmware hasn't already setup NISO pollers
        - NV4x IGP MSI disable, it doesn't appear to work correctly
        - Add GK208B to recognised boards (no code change aside from adding
        chipset recognition)
    
    * 'linux-3.19' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
      drm/nouveau/nouveau: Do not BUG_ON(!spin_is_locked()) on UP
      drm/nv4c/mc: disable msi
      drm/nouveau/fb/ram/mcp77: enable NISO poller
      drm/nouveau/fb/ram/mcp77: use carveout reg to determine size
      drm/nouveau/fb/ram/mcp77: subclass nouveau_ram
      drm/nouveau: wake up the card if necessary during gem callbacks
      drm/nouveau/device: Add support for GK208B, resolves bug 86935
      drm/nouveau: fix missing return statement in nouveau_ttm_tt_unpopulate
      drm/nouveau/bios: fix oops on pre-nv50 chipsets
    f6624888
nouveau_gem.c 23.5 KB