From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Thu, 22 Feb 2018 20:10:31 +0200 Subject: drm/i915: Nuke aux regs from intel_dp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Git-commit: 4904fa66f72d06b2a0a7a57e9196fb3102db0840 Patch-mainline: v4.17-rc1 References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166 Just store function pointers that give us the correct register offsets instead of storing the register offsets themselves. Slightly less efficient perhaps but saves a few bytes and better matches how we do things elsewhere. v2: Keep a local array of data registers (Chris) Reviewed-by: Chris Wilson Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20180222181036.15251-3-ville.syrjala@linux.intel.com Acked-by: Petr Tesarik --- drivers/gpu/drm/i915/intel_dp.c | 85 +++++++++++++++++++-------------------- drivers/gpu/drm/i915/intel_drv.h | 5 +- 2 files changed, 45 insertions(+), 45 deletions(-) --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -932,7 +932,7 @@ static uint32_t intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq) { struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp)); - i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg; + i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg(intel_dp); uint32_t status; bool done; @@ -1085,7 +1085,7 @@ intel_dp_aux_ch(struct intel_dp *intel_d struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct drm_i915_private *dev_priv = to_i915(intel_dig_port->base.base.dev); - i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg; + i915_reg_t ch_ctl, ch_data[5]; uint32_t aux_clock_divider; int i, ret, recv_bytes; uint32_t status; @@ -1093,6 +1093,10 @@ intel_dp_aux_ch(struct intel_dp *intel_d bool has_aux_irq = HAS_AUX_IRQ(dev_priv); bool vdd; + ch_ctl = intel_dp->aux_ch_ctl_reg(intel_dp); + for (i = 0; i < ARRAY_SIZE(ch_data); i++) + ch_data[i] = intel_dp->aux_ch_data_reg(intel_dp, i); + pps_lock(intel_dp); /* @@ -1150,7 +1154,7 @@ intel_dp_aux_ch(struct intel_dp *intel_d for (try = 0; try < 5; try++) { /* Load the send data into the aux channel data registers */ for (i = 0; i < send_bytes; i += 4) - I915_WRITE(intel_dp->aux_ch_data_reg[i >> 2], + I915_WRITE(ch_data[i >> 2], intel_dp_pack_aux(send + i, send_bytes - i)); @@ -1235,7 +1239,7 @@ done: recv_bytes = recv_size; for (i = 0; i < recv_bytes; i += 4) - intel_dp_unpack_aux(I915_READ(intel_dp->aux_ch_data_reg[i >> 2]), + intel_dp_unpack_aux(I915_READ(ch_data[i >> 2]), recv + i, recv_bytes - i); ret = recv_bytes; @@ -1392,9 +1396,11 @@ intel_aux_power_domain(struct intel_dp * } } -static i915_reg_t g4x_aux_ctl_reg(struct drm_i915_private *dev_priv, - enum aux_ch aux_ch) +static i915_reg_t g4x_aux_ctl_reg(struct intel_dp *intel_dp) { + struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp)); + enum aux_ch aux_ch = intel_dp->aux_ch; + switch (aux_ch) { case AUX_CH_B: case AUX_CH_C: @@ -1406,9 +1412,11 @@ static i915_reg_t g4x_aux_ctl_reg(struct } } -static i915_reg_t g4x_aux_data_reg(struct drm_i915_private *dev_priv, - enum aux_ch aux_ch, int index) +static i915_reg_t g4x_aux_data_reg(struct intel_dp *intel_dp, int index) { + struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp)); + enum aux_ch aux_ch = intel_dp->aux_ch; + switch (aux_ch) { case AUX_CH_B: case AUX_CH_C: @@ -1420,9 +1428,11 @@ static i915_reg_t g4x_aux_data_reg(struc } } -static i915_reg_t ilk_aux_ctl_reg(struct drm_i915_private *dev_priv, - enum aux_ch aux_ch) +static i915_reg_t ilk_aux_ctl_reg(struct intel_dp *intel_dp) { + struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp)); + enum aux_ch aux_ch = intel_dp->aux_ch; + switch (aux_ch) { case AUX_CH_A: return DP_AUX_CH_CTL(aux_ch); @@ -1436,9 +1446,11 @@ static i915_reg_t ilk_aux_ctl_reg(struct } } -static i915_reg_t ilk_aux_data_reg(struct drm_i915_private *dev_priv, - enum aux_ch aux_ch, int index) +static i915_reg_t ilk_aux_data_reg(struct intel_dp *intel_dp, int index) { + struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp)); + enum aux_ch aux_ch = intel_dp->aux_ch; + switch (aux_ch) { case AUX_CH_A: return DP_AUX_CH_DATA(aux_ch, index); @@ -1452,9 +1464,11 @@ static i915_reg_t ilk_aux_data_reg(struc } } -static i915_reg_t skl_aux_ctl_reg(struct drm_i915_private *dev_priv, - enum aux_ch aux_ch) +static i915_reg_t skl_aux_ctl_reg(struct intel_dp *intel_dp) { + struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp)); + enum aux_ch aux_ch = intel_dp->aux_ch; + switch (aux_ch) { case AUX_CH_A: case AUX_CH_B: @@ -1468,9 +1482,11 @@ static i915_reg_t skl_aux_ctl_reg(struct } } -static i915_reg_t skl_aux_data_reg(struct drm_i915_private *dev_priv, - enum aux_ch aux_ch, int index) +static i915_reg_t skl_aux_data_reg(struct intel_dp *intel_dp, int index) { + struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp)); + enum aux_ch aux_ch = intel_dp->aux_ch; + switch (aux_ch) { case AUX_CH_A: case AUX_CH_B: @@ -1484,37 +1500,20 @@ static i915_reg_t skl_aux_data_reg(struc } } -static i915_reg_t intel_aux_ctl_reg(struct drm_i915_private *dev_priv, - enum aux_ch aux_ch) -{ - if (INTEL_GEN(dev_priv) >= 9) - return skl_aux_ctl_reg(dev_priv, aux_ch); - else if (HAS_PCH_SPLIT(dev_priv)) - return ilk_aux_ctl_reg(dev_priv, aux_ch); - else - return g4x_aux_ctl_reg(dev_priv, aux_ch); -} - -static i915_reg_t intel_aux_data_reg(struct drm_i915_private *dev_priv, - enum aux_ch aux_ch, int index) -{ - if (INTEL_GEN(dev_priv) >= 9) - return skl_aux_data_reg(dev_priv, aux_ch, index); - else if (HAS_PCH_SPLIT(dev_priv)) - return ilk_aux_data_reg(dev_priv, aux_ch, index); - else - return g4x_aux_data_reg(dev_priv, aux_ch, index); -} - static void intel_aux_reg_init(struct intel_dp *intel_dp) { struct drm_i915_private *dev_priv = to_i915(intel_dp_to_dev(intel_dp)); - enum aux_ch aux_ch = intel_dp->aux_ch; - int i; - intel_dp->aux_ch_ctl_reg = intel_aux_ctl_reg(dev_priv, aux_ch); - for (i = 0; i < ARRAY_SIZE(intel_dp->aux_ch_data_reg); i++) - intel_dp->aux_ch_data_reg[i] = intel_aux_data_reg(dev_priv, aux_ch, i); + if (INTEL_GEN(dev_priv) >= 9) { + intel_dp->aux_ch_ctl_reg = skl_aux_ctl_reg; + intel_dp->aux_ch_data_reg = skl_aux_data_reg; + } else if (HAS_PCH_SPLIT(dev_priv)) { + intel_dp->aux_ch_ctl_reg = ilk_aux_ctl_reg; + intel_dp->aux_ch_data_reg = ilk_aux_data_reg; + } else { + intel_dp->aux_ch_ctl_reg = g4x_aux_ctl_reg; + intel_dp->aux_ch_data_reg = g4x_aux_data_reg; + } } static void --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1042,8 +1042,6 @@ struct intel_dp_compliance { struct intel_dp { i915_reg_t output_reg; - i915_reg_t aux_ch_ctl_reg; - i915_reg_t aux_ch_data_reg[5]; uint32_t DP; int link_rate; uint8_t lane_count; @@ -1128,6 +1126,9 @@ struct intel_dp { int send_bytes, uint32_t aux_clock_divider); + i915_reg_t (*aux_ch_ctl_reg)(struct intel_dp *dp); + i915_reg_t (*aux_ch_data_reg)(struct intel_dp *dp, int index); + /* This is called before a link training is starterd */ void (*prepare_link_retrain)(struct intel_dp *intel_dp);