• Linus Torvalds's avatar
    Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux · f2fde3a6
    Linus Torvalds authored
    Pull main drm updates from Dave Airlie:
     "This is the main merge window request for the drm.
    
      It's big, but jam packed will lots of features and of course 0
      regressions.  (okay maybe there'll be one).
    
      Highlights:
    
       - new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus
         (qemu only).  These drivers use the generic modesetting drivers.
    
       - initial prime/dma-buf support for i915, nouveau, radeon, udl and
         exynos
    
       - switcheroo audio support: so GPUs with HDMI can turn off the sound
         driver without crashing stuff.
    
       - There are some patches drifting outside drivers/gpu into x86 and
         EFI for better handling of multiple video adapters in Apple Macs,
         they've got correct acks except one trivial fixup.
    
       - Core:
    	edid parser has better DMT and reduced blanking support,
    	crtc properties,
    	plane properties,
    
       - Drivers:
    	exynos: add 2D core accel support, prime support, hdmi features
    	intel: more Haswell support, initial Valleyview support, more
    	    hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of
    	    cleanups and fixes
    	radeon: more HDMI audio support, improved GPU lockup recovery
    	    support, remove nested mutexes, less memory copying on PCIE, fix
    	    bus master enable race (kexec), improved fence handling
    	gma500: cleanups, 1080p support, acpi fixes
    	nouveau: better nva3 memory reclocking, kepler accel (needs
    	    external firmware rip), async buffer moves on nv84+ hw.
    
      I've some more dma-buf patches that rely on the dma-buf merge for vmap
      stuff, and I've a few fixes building up, but I'd decided I'd better
      get rid of the main pull sooner rather than later, so the audio guys
      are also unblocked."
    
    Fix up trivial conflict due to some duplicated changes in
    drivers/gpu/drm/i915/intel_ringbuffer.c
    
    * 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (605 commits)
      drm/nouveau/nvd9: Fix GPIO initialisation sequence.
      drm/nouveau: Unregister switcheroo client on exit
      drm/nouveau: Check dsm on switcheroo unregister
      drm/nouveau: fix a minor annoyance in an output string
      drm/nouveau: turn a BUG into a WARN
      drm/nv50: decode PGRAPH DATA_ERROR = 0x24
      drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
      drm/nvd9/copy: initialise copy engine, seems to work like nvc0
      drm/nvc0/ttm: use copy engines for async buffer moves
      drm/nva3/ttm: use copy engine for async buffer moves
      drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method
      drm/nv84/ttm: use crypto engine for async buffer copies
      drm/nouveau/ttm: untangle code to support accelerated buffer moves
      drm/nouveau/fbcon: use fence for sync, rather than notifier
      drm/nv98/crypt: non-stub implementation of the engine hooks
      drm/nouveau/fifo: turn all fifo modules into engine modules
      drm/nv50/graph: remove ability to do interrupt-driven context switching
      drm/nv50: remove manual context unload on context destruction
      drm/nv50: remove execution engine context saves on suspend
      drm/nv50/fifo: use hardware channel kickoff functionality
      ...
    f2fde3a6
fixup.c 18 KB