Commit fa1b97f8 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915/dsb: Use non-locked register access

Avoid the locking overhead for DSB registers. We don't need the locks
and intel_dsb_commit() in particular needs to be called from the
vblank evade critical section and thus needs to be fast.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230606191504.18099-3-ville.syrjala@linux.intel.comReviewed-by: default avatarUma Shankar <uma.shankar@intel.com>
parent f067976e
...@@ -112,7 +112,7 @@ static void intel_dsb_dump(struct intel_dsb *dsb) ...@@ -112,7 +112,7 @@ static void intel_dsb_dump(struct intel_dsb *dsb)
static bool is_dsb_busy(struct drm_i915_private *i915, enum pipe pipe, static bool is_dsb_busy(struct drm_i915_private *i915, enum pipe pipe,
enum dsb_id id) enum dsb_id id)
{ {
return intel_de_read(i915, DSB_CTRL(pipe, id)) & DSB_STATUS_BUSY; return intel_de_read_fw(i915, DSB_CTRL(pipe, id)) & DSB_STATUS_BUSY;
} }
static void intel_dsb_emit(struct intel_dsb *dsb, u32 ldw, u32 udw) static void intel_dsb_emit(struct intel_dsb *dsb, u32 ldw, u32 udw)
...@@ -273,12 +273,12 @@ void intel_dsb_commit(struct intel_dsb *dsb, bool wait_for_vblank) ...@@ -273,12 +273,12 @@ void intel_dsb_commit(struct intel_dsb *dsb, bool wait_for_vblank)
return; return;
} }
intel_de_write(dev_priv, DSB_CTRL(pipe, dsb->id), intel_de_write_fw(dev_priv, DSB_CTRL(pipe, dsb->id),
(wait_for_vblank ? DSB_WAIT_FOR_VBLANK : 0) | (wait_for_vblank ? DSB_WAIT_FOR_VBLANK : 0) |
DSB_ENABLE); DSB_ENABLE);
intel_de_write(dev_priv, DSB_HEAD(pipe, dsb->id), intel_de_write_fw(dev_priv, DSB_HEAD(pipe, dsb->id),
i915_ggtt_offset(dsb->vma)); i915_ggtt_offset(dsb->vma));
intel_de_write(dev_priv, DSB_TAIL(pipe, dsb->id), intel_de_write_fw(dev_priv, DSB_TAIL(pipe, dsb->id),
i915_ggtt_offset(dsb->vma) + tail); i915_ggtt_offset(dsb->vma) + tail);
} }
...@@ -307,7 +307,7 @@ void intel_dsb_wait(struct intel_dsb *dsb) ...@@ -307,7 +307,7 @@ void intel_dsb_wait(struct intel_dsb *dsb)
/* Attempt to reset it */ /* Attempt to reset it */
dsb->free_pos = 0; dsb->free_pos = 0;
dsb->ins_start_offset = 0; dsb->ins_start_offset = 0;
intel_de_write(dev_priv, DSB_CTRL(pipe, dsb->id), 0); intel_de_write_fw(dev_priv, DSB_CTRL(pipe, dsb->id), 0);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment