Skip to content

Commit fa1b97f

Browse files
committed
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: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230606191504.18099-3-ville.syrjala@linux.intel.com Reviewed-by: Uma Shankar <uma.shankar@intel.com>
1 parent f067976 commit fa1b97f

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

drivers/gpu/drm/i915/display/intel_dsb.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static void intel_dsb_dump(struct intel_dsb *dsb)
112112
static bool is_dsb_busy(struct drm_i915_private *i915, enum pipe pipe,
113113
enum dsb_id id)
114114
{
115-
return intel_de_read(i915, DSB_CTRL(pipe, id)) & DSB_STATUS_BUSY;
115+
return intel_de_read_fw(i915, DSB_CTRL(pipe, id)) & DSB_STATUS_BUSY;
116116
}
117117

118118
static void intel_dsb_emit(struct intel_dsb *dsb, u32 ldw, u32 udw)
@@ -273,13 +273,13 @@ void intel_dsb_commit(struct intel_dsb *dsb, bool wait_for_vblank)
273273
return;
274274
}
275275

276-
intel_de_write(dev_priv, DSB_CTRL(pipe, dsb->id),
277-
(wait_for_vblank ? DSB_WAIT_FOR_VBLANK : 0) |
278-
DSB_ENABLE);
279-
intel_de_write(dev_priv, DSB_HEAD(pipe, dsb->id),
280-
i915_ggtt_offset(dsb->vma));
281-
intel_de_write(dev_priv, DSB_TAIL(pipe, dsb->id),
282-
i915_ggtt_offset(dsb->vma) + tail);
276+
intel_de_write_fw(dev_priv, DSB_CTRL(pipe, dsb->id),
277+
(wait_for_vblank ? DSB_WAIT_FOR_VBLANK : 0) |
278+
DSB_ENABLE);
279+
intel_de_write_fw(dev_priv, DSB_HEAD(pipe, dsb->id),
280+
i915_ggtt_offset(dsb->vma));
281+
intel_de_write_fw(dev_priv, DSB_TAIL(pipe, dsb->id),
282+
i915_ggtt_offset(dsb->vma) + tail);
283283
}
284284

285285
void intel_dsb_wait(struct intel_dsb *dsb)
@@ -307,7 +307,7 @@ void intel_dsb_wait(struct intel_dsb *dsb)
307307
/* Attempt to reset it */
308308
dsb->free_pos = 0;
309309
dsb->ins_start_offset = 0;
310-
intel_de_write(dev_priv, DSB_CTRL(pipe, dsb->id), 0);
310+
intel_de_write_fw(dev_priv, DSB_CTRL(pipe, dsb->id), 0);
311311
}
312312

313313
/**

0 commit comments

Comments
 (0)