Commit 7f57f215 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915/dsb: Polish the DSB ID enum

Namespace the DSB ID enum properly, and make the naming match
other such enums in general. Also make the names 0 based as
that's what Bspec uses for DSB (unlike eg. planes where it
uses 1 based indexing).

We'll throw out INVALID_DSB while at it since we have no use for
it at the moment.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240531114101.19994-2-ville.syrjala@linux.intel.comReviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 30ca6365
...@@ -18,16 +18,16 @@ ...@@ -18,16 +18,16 @@
#define CACHELINE_BYTES 64 #define CACHELINE_BYTES 64
enum dsb_id { enum intel_dsb_id {
INVALID_DSB = -1, INTEL_DSB_0,
DSB1, INTEL_DSB_1,
DSB2, INTEL_DSB_2,
DSB3,
MAX_DSB_PER_PIPE I915_MAX_DSBS,
}; };
struct intel_dsb { struct intel_dsb {
enum dsb_id id; enum intel_dsb_id id;
struct intel_dsb_buffer dsb_buf; struct intel_dsb_buffer dsb_buf;
struct intel_crtc *crtc; struct intel_crtc *crtc;
...@@ -120,9 +120,9 @@ static void intel_dsb_dump(struct intel_dsb *dsb) ...@@ -120,9 +120,9 @@ 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 intel_dsb_id dsb_id)
{ {
return intel_de_read_fw(i915, DSB_CTRL(pipe, id)) & DSB_STATUS_BUSY; return intel_de_read_fw(i915, DSB_CTRL(pipe, dsb_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)
...@@ -481,7 +481,7 @@ struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state, ...@@ -481,7 +481,7 @@ struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state,
intel_runtime_pm_put(&i915->runtime_pm, wakeref); intel_runtime_pm_put(&i915->runtime_pm, wakeref);
dsb->id = DSB1; dsb->id = INTEL_DSB_0;
dsb->crtc = crtc; dsb->crtc = crtc;
dsb->size = size / 4; /* in dwords */ dsb->size = size / 4; /* in dwords */
dsb->free_pos = 0; dsb->free_pos = 0;
...@@ -496,7 +496,7 @@ struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state, ...@@ -496,7 +496,7 @@ struct intel_dsb *intel_dsb_prepare(const struct intel_crtc_state *crtc_state,
out: out:
drm_info_once(&i915->drm, drm_info_once(&i915->drm,
"[CRTC:%d:%s] DSB %d queue setup failed, will fallback to MMIO for display HW programming\n", "[CRTC:%d:%s] DSB %d queue setup failed, will fallback to MMIO for display HW programming\n",
crtc->base.base.id, crtc->base.name, DSB1); crtc->base.base.id, crtc->base.name, INTEL_DSB_0);
return NULL; return NULL;
} }
......
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