• Dave Airlie's avatar
    Merge tag 'drm-intel-next-2014-05-06' of git://anongit.freedesktop.org/drm-intel into drm-next · e5daa1dd
    Dave Airlie authored
    - ring init improvements (Chris)
    - vebox2 support (Zhao Yakui)
    - more prep work for runtime pm on Baytrail (Imre)
    - eDram support for BDW (Ben)
    - prep work for userptr support (Chris)
    - first parts of the encoder->mode_set callback removal (Daniel)
    - 64b reloc fixes (Ben)
    - first part of atomic plane updates (Ville)
    
    * tag 'drm-intel-next-2014-05-06' of git://anongit.freedesktop.org/drm-intel: (75 commits)
      drm/i915: Remove useless checks from primary enable/disable
      drm/i915: Merge LP1+ watermarks in safer way
      drm/i915: Make sure computed watermarks never overflow the registers
      drm/i915: Add pipe update trace points
      drm/i915: Perform primary enable/disable atomically with sprite updates
      drm/i915: Make sprite updates atomic
      drm/i915: Support 64b relocations
      drm/i915: Support 64b execbuf
      drm/i915/sdvo: Remove ->mode_set callback
      drm/i915/crt: Remove ->mode_set callback
      drm/i915/tv: Remove ->mode_set callback
      drm/i915/tv: Rip out pipe-disabling nonsense from ->mode_set
      drm/i915/tv: De-magic device check
      drm/i915/tv: extract set_color_conversion
      drm/i915/tv: extract set_tv_mode_timings
      drm/i915/dvo: Remove ->mode_set callback
      drm/i915: Make encoder->mode_set callbacks optional
      drm/i915: Make primary_enabled match the actual hardware state
      drm/i915: Move ring_begin to signal()
      drm/i915: Virtualize the ringbuffer signal func
      ...
    e5daa1dd
drm.tmpl 134 KB