1. 19 May, 2020 13 commits
  2. 18 May, 2020 4 commits
  3. 16 May, 2020 2 commits
  4. 15 May, 2020 14 commits
  5. 14 May, 2020 7 commits
    • Joonas Lahtinen's avatar
      drm/i915: Document locking guidelines · ca69a3c6
      Joonas Lahtinen authored
      To ensure cross-driver locking compatibility, document the expected
      guidelines for implementing the GEM locking in i915. Note that this
      is a description of how things should end up after being reworked,
      and does not reflect the current state of things.
      
      v2: Use rst note:: tag (Rodrigo)
      Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Cc: Dave Airlie <airlied@redhat.com>
      Cc: Matthew Auld <matthew.auld@intel.com>
      Cc: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
      Cc: CQ Tang <cq.tang@intel.com>
      Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Acked-by: default avatarDave Airlie <airlied@redhat.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20190830105053.17491-1-joonas.lahtinen@linux.intel.com
      ca69a3c6
    • Ville Syrjälä's avatar
      drm/i915: Extract i915_cs_timestamp_{ns_to_ticks,tick_to_ns}() · 802a5820
      Ville Syrjälä authored
      Pull the code to do the CS timestamp ns<->ticks conversion into
      helpers and use them all over.
      
      The check in i915_perf_noa_delay_set() seems a bit dubious,
      so we switch it to do what I assume it wanted to do all along
      (ie. make sure the resulting delay in CS timestamp ticks
      doesn't exceed 32bits)?
      
      Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20200302143943.32676-5-ville.syrjala@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      802a5820
    • Ville Syrjälä's avatar
      drm/i915: Store CS timestamp frequency in Hz · 56f1b31f
      Ville Syrjälä authored
      kHz isn't accurate enough for storing the CS timestamp
      frequency on some of the platforms. Store the value
      in Hz instead.
      
      Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20200302143943.32676-2-ville.syrjala@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Reviewed-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
      56f1b31f
    • Ville Syrjälä's avatar
      drm/i915: Nuke pointless div by 64bit · 2e270158
      Ville Syrjälä authored
      Bunch of places use a 64bit divisor needlessly. Switch
      to 32bit divisor.
      
      Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20200302143943.32676-1-ville.syrjala@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      2e270158
    • Stanislav Lisovskiy's avatar
    • Stanislav Lisovskiy's avatar
      drm/i915: Restrict qgv points which don't have enough bandwidth. · 20f505f2
      Stanislav Lisovskiy authored
      According to BSpec 53998, we should try to
      restrict qgv points, which can't provide
      enough bandwidth for desired display configuration.
      
      Currently we are just comparing against all of
      those and take minimum(worst case).
      
      v2: Fixed wrong PCode reply mask, removed hardcoded
          values.
      
      v3: Forbid simultaneous legacy SAGV PCode requests and
          restricting qgv points. Put the actual restriction
          to commit function, added serialization(thanks to Ville)
          to prevent commit being applied out of order in case of
          nonblocking and/or nomodeset commits.
      
      v4:
          - Minor code refactoring, fixed few typos(thanks to James Ausmus)
          - Change the naming of qgv point
            masking/unmasking functions(James Ausmus).
          - Simplify the masking/unmasking operation itself,
            as we don't need to mask only single point per request(James Ausmus)
          - Reject and stick to highest bandwidth point if SAGV
            can't be enabled(BSpec)
      
      v5:
          - Add new mailbox reply codes, which seems to happen during boot
            time for TGL and indicate that QGV setting is not yet available.
      
      v6:
          - Increase number of supported QGV points to be in sync with BSpec.
      
      v7: - Rebased and resolved conflict to fix build failure.
          - Fix NUM_QGV_POINTS to 8 and moved that to header file(James Ausmus)
      
      v8: - Don't report an error if we can't restrict qgv points, as SAGV
            can be disabled by BIOS, which is completely legal. So don't
            make CI panic. Instead if we detect that there is only 1 QGV
            point accessible just analyze if we can fit the required bandwidth
            requirements, but no need in restricting.
      
      v9: - Fix wrong QGV transition if we have 0 planes and no SAGV
            simultaneously.
      
      v10: - Fix CDCLK corruption, because of global state getting serialized
             without modeset, which caused copying of non-calculated cdclk
             to be copied to dev_priv(thanks to Ville for the hint).
      
      v11: - Remove unneeded headers and spaces(Matthew Roper)
           - Remove unneeded intel_qgv_info qi struct from bw check and zero
             out the needed one(Matthew Roper)
           - Changed QGV error message to have more clear meaning(Matthew Roper)
           - Use state->modeset_set instead of any_ms(Matthew Roper)
           - Moved NUM_SAGV_POINTS from i915_reg.h to i915_drv.h where it's used
           - Keep using crtc_state->hw.active instead of .enable(Matthew Roper)
           - Moved unrelated changes to other patch(using latency as parameter
             for plane wm calculation, moved to SAGV refactoring patch)
      
      v12: - Fix rebase conflict with own temporary SAGV/QGV fix.
           - Remove unnecessary mask being zero check when unmasking
             qgv points as this is completely legal(Matt Roper)
           - Check if we are setting the same mask as already being set
             in hardware to prevent error from PCode.
           - Fix error message when restricting/unrestricting qgv points
             to "mask/unmask" which sounds more accurate(Matt Roper)
           - Move sagv status setting to icl_get_bw_info from atomic check
             as this should be calculated only once.(Matt Roper)
           - Edited comments for the case when we can't enable SAGV and
             use only 1 QGV point with highest bandwidth to be more
             understandable.(Matt Roper)
      
      v13: - Moved max_data_rate in bw check to closer scope(Ville Syrjälä)
           - Changed comment for zero new_mask in qgv points masking function
             to better reflect reality(Ville Syrjälä)
           - Simplified bit mask operation in qgv points masking function
             (Ville Syrjälä)
           - Moved intel_qgv_points_mask closer to gen11 SAGV disabling,
             however this still can't be under modeset condition(Ville Syrjälä)
           - Packed qgv_points_mask as u8 and moved closer to pipe_sagv_mask
             (Ville Syrjälä)
           - Extracted PCode changes to separate patch.(Ville Syrjälä)
           - Now treat num_planes 0 same as 1 to avoid confusion and
             returning max_bw as 0, which would prevent choosing QGV
             point having max bandwidth in case if SAGV is not allowed,
             as per BSpec(Ville Syrjälä)
           - Do the actual qgv_points_mask swap in the same place as
             all other global state parts like cdclk are swapped.
             In the next patch, this all will be moved to bw state as
             global state, once new global state patch series from Ville
             lands
      
      v14: - Now using global state to serialize access to qgv points
           - Added global state locking back, otherwise we seem to read
             bw state in a wrong way.
      
      v15: - Added TODO comment for near atomic global state locking in
             bw code.
      
      v16: - Fixed intel_atomic_bw_* functions to be intel_bw_* as discussed
             with Jani Nikula.
           - Take bw_state_changed flag into use.
      
      v17: - Moved qgv point related manipulations next to SAGV code, as
             those are semantically related(Ville Syrjälä)
           - Renamed those into intel_sagv_(pre)|(post)_plane_update
             (Ville Syrjälä)
      
      v18: - Move sagv related calls from commit tail into
             intel_sagv_(pre)|(post)_plane_update(Ville Syrjälä)
      
      v19: - Use intel_atomic_get_bw_(old)|(new)_state which is intended
             for commit tail stage.
      
      v20: - Return max bandwidth for 0 planes(Ville)
           - Constify old_bw_state in bw_atomic_check(Ville)
           - Removed some debugs(Ville)
           - Added data rate to debug print when no QGV points(Ville)
           - Removed some comments(Ville)
      
      v21, v22, v23: - Fixed rebase conflict
      
      v24: - Changed PCode mask to use ICL_ prefix
      v25: - Resolved rebase conflict
      
      v26: - Removed redundant NULL checks(Ville)
           - Removed redundant error prints(Ville)
      
      v27: - Use device specific drm_err(Ville)
           - Fixed parenthesis ident reported by checkpatch
             Line over 100 warns to be fixed together with
             existing code style.
      Signed-off-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
      Cc: Ville Syrjälä <ville.syrjala@intel.com>
      Cc: James Ausmus <james.ausmus@intel.com>
      [vsyrjala: Drop duplicate intel_sagv_{pre,post}_plane_update() prototypes
                 and drop unused NUM_SAGV_POINTS define]
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20200514074853.9508-3-stanislav.lisovskiy@intel.com
      20f505f2
    • Stanislav Lisovskiy's avatar
      drm/i915: Add TGL+ SAGV support · 7241c57d
      Stanislav Lisovskiy authored
      Starting from TGL we need to have a separate wm0
      values for SAGV and non-SAGV which affects
      how calculations are done.
      
      v2: Remove long lines
      v3: Removed COLOR_PLANE enum references
      v4, v5, v6: Fixed rebase conflict
      v7: - Removed skl_plane_wm_level accessor from skl_allocate_pipe_ddb(Ville)
          - Removed sagv_uv_wm0(Ville)
          - can_sagv->use_sagv_wm(Ville)
      
      v8: - Moved tgl_crtc_can_enable_sagv function up(Ville)
          - Changed comment regarding pipe_wm usage(Ville)
          - Call intel_can_enable_sagv and tgl_compute_sagv_wm only
            for Gen12(Ville)
          - Some sagv debugs removed(Ville)
          - skl_print_wm_changes improvements(Ville)
          - Do assignment instead of memcpy in
            skl_pipe_wm_get_hw_state(Ville)
      
      v9: - Removed can_sagv variable(Ville)
          - Removed spurious line(Ville)
          - Changed u32 to unsigned int as agreed(Ville)
          - Assign sagv only for gen12 in
            skl_pipe_wm_get_hw_state(Ville)
      Signed-off-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
      [vsyrjala: Remove the dead 'return false' from intel_crtc_can_enable_sagv()]
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20200514074853.9508-2-stanislav.lisovskiy@intel.com
      7241c57d