1. 15 Apr, 2015 2 commits
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux into drm-next · fc16fc4d
      Dave Airlie authored
      Some final bits for 4.1.  Some fixes for userptrs and allow a new
      packet for VCE to enable some new features in mesa.
      
      * 'drm-next-4.1' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: allow creating overlapping userptrs
        drm/radeon: add userptr config option
        drm/radeon: add video usability info support for VCE
      fc16fc4d
    • Dave Airlie's avatar
      Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next · 665ae581
      Dave Airlie authored
      - gk20a iommu support
      - gm107 graphics support without needing proprietary ucode
      - various random fixes
      - more gm20x bring-up, fifo/ce are ok, gr is mostly complete with the
      exception of ctxsw ucode.. nvidia aren't playing nice yet so there's
      not much more that can be done at this point...
      
      I spent a lot of time trying to find a viable way of doing gr ctxsw
      without signed firmware, but the "security" restrictions on the
      fecs/gpccs falcons are excessive and go beyond what'd be necessary to
      protect the host from malicious firmware.  This newer nvidia hw is
      VERY open-source unfriendly.
      
      I have some experimental host-based ctxsw work that could be a viable
      (albeit unsatisfactory and slow) workaround in the meantime, but it
      needs some more work and i'd like to get the 3d driver working
      properly before i commit to pushing it.
      
      * 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (40 commits)
        drm/nouveau/bios: fix fetching from acpi on certain systems
        drm/nouveau/gr/gm206: initial init+ctx code
        drm/nouveau/ce/gm206: enable support via gm204 code
        drm/nouveau/fifo/gm206: enable support via gm204 code
        drm/nouveau/gr/gm204: initial init+ctx code
        drm/nouveau: support for buffer moves via MaxwellDmaCopyA
        drm/nouveau/ce/gm204: initial support
        drm/nouveau: add support for gm20x fifo channels
        drm/nouveau/fifo/gm204: initial support
        drm/nouveau/gr/gk104-: prevent reading non-existent regs in intr handler
        drm/nouveau/gr/gm107: very slightly demagic part of attrib cb setup
        drm/nouveau/gr/gk104-: correct crop/zrop num_active_fbps setting
        drm/nouveau/gr/gf100-: add symbolic names for classes
        drm/nouveau/gr/gm107: support tpc "strand" ctxsw in gpccs ucode
        drm/nouveau/gr/gf100-: support mmio access with gpc offset from gpccs ucode
        drm/nouveau/gr: fix engine name, cosmetic search+replace mistake
        drm/nouveau/pmu/gk20a: add some missing statics
        drm/nouveau/platform: fix probe error path
        drm/nouveau/platform: release IOMMU's mm upon exit
        drm/nouveau/gr/gk104-gk20a: call pmu to disable any power-gating before ctor()
        ...
      665ae581
  2. 14 Apr, 2015 38 commits