1. 08 Mar, 2017 4 commits
    • Ville Syrjälä's avatar
      drm/i915: Nuke debug messages from the pipe update critical section · c3f8ad57
      Ville Syrjälä authored
      printks are slow so we should not be doing them from the vblank evade
      critical section. These could explain why we sometimes seem to
      blow past our 100 usec deadline.
      
      The problem has been there ever since commit bfd16b2a ("drm/i915:
      Make updating pipe without modeset atomic.") but it may not have
      been readily visible until commit e1edbd44 ("drm/i915: Complain
      if we take too long under vblank evasion.") increased our chances
      of noticing it.
      
      Cc: stable@vger.kernel.org
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Fixes: bfd16b2a ("drm/i915: Make updating pipe without modeset atomic.")
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/20170307205419.19447-1-ville.syrjala@linux.intel.comReviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      c3f8ad57
    • Daniel Vetter's avatar
      Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued · 7ffe939d
      Daniel Vetter authored
      Backmerge drm-next to get at all the good stuff in drm-misc. We need
      that because:
      
      - drm_connector_list_iter conversion for i915 needs the core patches.
      - Maarten's patches to use the new atomic state iterators also need
        the core patches.
      - We need the new link status property to complete the DP retraining
        work, merging through 2 branches wasn't a good idea and we had to
        partially backtrack.
      - Chris needs reservation_object_trylock and we want to roll out
        kref_read everywhere.
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      7ffe939d
    • Dave Airlie's avatar
      Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next · 6796b129
      Dave Airlie authored
      - Re-architecture of the code to handle proprietary fw, more abstracted
      to support the multitude of differences that NVIDIA introduce
      - Support in the said code for GP10x ACR and GR fw, giving acceleration
      support \o/
      - Fix for GTX 970 GPUs that are in an odd MMU configuration
      
      * 'linux-4.12' of git://github.com/skeggsb/linux: (60 commits)
        drm/nouveau/fb/gf100-: rework ram detection
        drm/nouveau/fb/gm200: split ram implementation from gm107
        drm/nouveau/fb/gf108: split implementation from gf100
        drm/nouveau/fb/gf100-: modify constructors to allow more customisation
        drm/nouveau/kms/nv50: use drm core i2c-over-aux algorithm
        drm/nouveau/i2c/g94-: return REPLY_M value on reads
        drm/nouveau/i2c: modify aux interface to return length actually transferred
        drm/nouveau/gp10x: enable secboot and GR
        drm/nouveau/gr/gp102: initial support
        drm/nouveau/falcon: support for gp10x msgqueue
        drm/nouveau/secboot: add gp102/gp104/gp106/gp107 support
        drm/nouveau/secboot: put HS code loading code into own file
        drm/nouveau/secboot: support for r375 ACR
        drm/nouveau/secboot: support for r367 ACR
        drm/nouveau/secboot: support for r364 ACR
        drm/nouveau/secboot: workaround bug when starting SEC2 firmware
        drm/nouveau/secboot: support standard NVIDIA HS binaries
        drm/nouveau/secboot: support for unload blob bootloader
        drm/nouveau/secboot: let callers interpret return value of blobs
        drm/nouveau/secboot: support for different load and unload falcons
        ...
      6796b129
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2017-03-06' of git://anongit.freedesktop.org/git/drm-intel into drm-next · 2e161017
      Dave Airlie authored
      4 weeks worth of stuff since I was traveling&lazy:
      
      - lspcon improvements (Imre)
      - proper atomic state for cdclk handling (Ville)
      - gpu reset improvements (Chris)
      - lots and lots of polish around fences, requests, waiting and
        everything related all over (both gem and modeset code), from Chris
      - atomic by default on gen5+ minus byt/bsw (Maarten did the patch to
        flip the default, really this is a massive joint team effort)
      - moar power domains, now 64bit (Ander)
      - big pile of in-kernel unit tests for various gem subsystems (Chris),
        including simple mock objects for i915 device and and the ggtt
        manager.
      - i915_gpu_info in debugfs, for taking a snapshot of the current gpu
        state. Same thing as i915_error_state, but useful if the kernel didn't
        notice something is stick. From Chris.
      - bxt dsi fixes (Umar Shankar)
      - bxt w/a updates (Jani)
      - no more struct_mutex for gem object unreference (Chris)
      - some execlist refactoring (Tvrtko)
      - color manager support for glk (Ander)
      - improve the power-well sync code to better take over from the
        firmware (Imre)
      - gem tracepoint polish (Tvrtko)
      - lots of glk fixes all around (Ander)
      - ctx switch improvements (Chris)
      - glk dsi support&fixes (Deepak M)
      - dsi fixes for vlv and clanups, lots of them (Hans de Goede)
      - switch to i915.ko types in lots of our internal modeset code (Ander)
      - byt/bsw atomic wm update code, yay (Ville)
      
      * tag 'drm-intel-next-2017-03-06' of git://anongit.freedesktop.org/git/drm-intel: (432 commits)
        drm/i915: Update DRIVER_DATE to 20170306
        drm/i915: Don't use enums for hardware engine id
        drm/i915: Split breadcrumbs spinlock into two
        drm/i915: Refactor wakeup of the next breadcrumb waiter
        drm/i915: Take reference for signaling the request from hardirq
        drm/i915: Add FIFO underrun tracepoints
        drm/i915: Add cxsr toggle tracepoint
        drm/i915: Add VLV/CHV watermark/FIFO programming tracepoints
        drm/i915: Add plane update/disable tracepoints
        drm/i915: Kill level 0 wm hack for VLV/CHV
        drm/i915: Workaround VLV/CHV sprite1->sprite0 enable underrun
        drm/i915: Sanitize VLV/CHV watermarks properly
        drm/i915: Only use update_wm_{pre,post} for pre-ilk platforms
        drm/i915: Nuke crtc->wm.cxsr_allowed
        drm/i915: Compute proper intermediate wms for vlv/cvh
        drm/i915: Skip useless watermark/FIFO related work on VLV/CHV when not needed
        drm/i915: Compute vlv/chv wms the atomic way
        drm/i915: Compute VLV/CHV FIFO sizes based on the PM2 watermarks
        drm/i915: Plop vlv/chv fifo sizes into crtc state
        drm/i915: Plop vlv wm state into crtc_state
        ...
      2e161017
  2. 07 Mar, 2017 36 commits