Skip to content

L
linux
Commit 830de422 authored by Jani Nikula's avatar Jani Nikula
Browse files
Options

drm/i915/dp: switch to kernel types 

Mixed C99 and kernel types use is getting ugly. Prefer kernel types.

sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'

Minor checkpatch/whitespace fixes sprinkled on top of the changed lines.
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/3c030a12b4313eec512ce2b7a953cff439d8af67.1547629303.git.jani.nikula@intel.com
parent 990290d1
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 87 deletions
drivers/gpu/drm/i915/intel_dp.c
View file @ 830de422
...@@ -429,7 +429,7 @@ static void intel_dp_set_common_rates(struct intel_dp *intel_dp) ...@@ -429,7 +429,7 @@ static void intel_dp_set_common_rates(struct intel_dp *intel_dp)
} }
static bool intel_dp_link_params_valid(struct intel_dp *intel_dp, int link_rate, static bool intel_dp_link_params_valid(struct intel_dp *intel_dp, int link_rate,
uint8_t lane_count) u8 lane_count)
{ {
/* /*
* FIXME: we need to synchronize the current link parameters with * FIXME: we need to synchronize the current link parameters with
...@@ -449,7 +449,7 @@ static bool intel_dp_link_params_valid(struct intel_dp *intel_dp, int link_rate, ...@@ -449,7 +449,7 @@ static bool intel_dp_link_params_valid(struct intel_dp *intel_dp, int link_rate,
static bool intel_dp_can_link_train_fallback_for_edp(struct intel_dp *intel_dp, static bool intel_dp_can_link_train_fallback_for_edp(struct intel_dp *intel_dp,
int link_rate, int link_rate,
uint8_t lane_count) u8 lane_count)
{ {
const struct drm_display_mode *fixed_mode = const struct drm_display_mode *fixed_mode =
intel_dp->attached_connector->panel.fixed_mode; intel_dp->attached_connector->panel.fixed_mode;
...@@ -464,7 +464,7 @@ static bool intel_dp_can_link_train_fallback_for_edp(struct intel_dp *intel_dp, ...@@ -464,7 +464,7 @@ static bool intel_dp_can_link_train_fallback_for_edp(struct intel_dp *intel_dp,
} }
int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp, int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp,
int link_rate, uint8_t lane_count) int link_rate, u8 lane_count)
{ {
int index; int index;
...@@ -572,19 +572,19 @@ intel_dp_mode_valid(struct drm_connector *connector, ...@@ -572,19 +572,19 @@ intel_dp_mode_valid(struct drm_connector *connector,
return MODE_OK; return MODE_OK;
} }
uint32_t intel_dp_pack_aux(const uint8_t *src, int src_bytes) u32 intel_dp_pack_aux(const u8 *src, int src_bytes)
{ {
int i; int i;
uint32_t v = 0; u32 v = 0;
if (src_bytes > 4) if (src_bytes > 4)
src_bytes = 4; src_bytes = 4;
for (i = 0; i < src_bytes; i++) for (i = 0; i < src_bytes; i++)
v |= ((uint32_t) src[i]) << ((3-i) * 8); v |= ((u32)src[i]) << ((3 - i) * 8);
return v; return v;
} }
static void intel_dp_unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes) static void intel_dp_unpack_aux(u32 src, u8 *dst, int dst_bytes)
{ {
int i; int i;
if (dst_bytes > 4) if (dst_bytes > 4)
...@@ -643,7 +643,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp) ...@@ -643,7 +643,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)
bool pll_enabled, release_cl_override = false; bool pll_enabled, release_cl_override = false;
enum dpio_phy phy = DPIO_PHY(pipe); enum dpio_phy phy = DPIO_PHY(pipe);
enum dpio_channel ch = vlv_pipe_to_channel(pipe); enum dpio_channel ch = vlv_pipe_to_channel(pipe);
uint32_t DP; u32 DP;
if (WARN(I915_READ(intel_dp->output_reg) & DP_PORT_EN, if (WARN(I915_READ(intel_dp->output_reg) & DP_PORT_EN,
"skipping pipe %c power sequencer kick due to port %c being active\n", "skipping pipe %c power sequencer kick due to port %c being active\n",
...@@ -1051,12 +1051,12 @@ intel_dp_check_edp(struct intel_dp *intel_dp) ...@@ -1051,12 +1051,12 @@ intel_dp_check_edp(struct intel_dp *intel_dp)
} }
} }
static uint32_t static u32
intel_dp_aux_wait_done(struct intel_dp *intel_dp) intel_dp_aux_wait_done(struct intel_dp *intel_dp)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg(intel_dp); i915_reg_t ch_ctl = intel_dp->aux_ch_ctl_reg(intel_dp);
uint32_t status; u32 status;
bool done; bool done;
#define C (((status = I915_READ_NOTRACE(ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0) #define C (((status = I915_READ_NOTRACE(ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0)
...@@ -1069,7 +1069,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp) ...@@ -1069,7 +1069,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp)
return status; return status;
} }
static uint32_t g4x_get_aux_clock_divider(struct intel_dp *intel_dp, int index) static u32 g4x_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
...@@ -1083,7 +1083,7 @@ static uint32_t g4x_get_aux_clock_divider(struct intel_dp *intel_dp, int index) ...@@ -1083,7 +1083,7 @@ static uint32_t g4x_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
return DIV_ROUND_CLOSEST(dev_priv->rawclk_freq, 2000); return DIV_ROUND_CLOSEST(dev_priv->rawclk_freq, 2000);
} }
static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index) static u32 ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
...@@ -1102,7 +1102,7 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index) ...@@ -1102,7 +1102,7 @@ static uint32_t ilk_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
return DIV_ROUND_CLOSEST(dev_priv->rawclk_freq, 2000); return DIV_ROUND_CLOSEST(dev_priv->rawclk_freq, 2000);
} }
static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index) static u32 hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
...@@ -1119,7 +1119,7 @@ static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index) ...@@ -1119,7 +1119,7 @@ static uint32_t hsw_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
return ilk_get_aux_clock_divider(intel_dp, index); return ilk_get_aux_clock_divider(intel_dp, index);
} }
static uint32_t skl_get_aux_clock_divider(struct intel_dp *intel_dp, int index) static u32 skl_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
{ {
/* /*
* SKL doesn't need us to program the AUX clock divider (Hardware will * SKL doesn't need us to program the AUX clock divider (Hardware will
...@@ -1129,14 +1129,14 @@ static uint32_t skl_get_aux_clock_divider(struct intel_dp *intel_dp, int index) ...@@ -1129,14 +1129,14 @@ static uint32_t skl_get_aux_clock_divider(struct intel_dp *intel_dp, int index)
return index ? 0 : 1; return index ? 0 : 1;
} }
static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp, static u32 g4x_get_aux_send_ctl(struct intel_dp *intel_dp,
int send_bytes, int send_bytes,
uint32_t aux_clock_divider) u32 aux_clock_divider)
{ {
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
struct drm_i915_private *dev_priv = struct drm_i915_private *dev_priv =
to_i915(intel_dig_port->base.base.dev); to_i915(intel_dig_port->base.base.dev);
uint32_t precharge, timeout; u32 precharge, timeout;
if (IS_GEN(dev_priv, 6)) if (IS_GEN(dev_priv, 6))
precharge = 3; precharge = 3;
...@@ -1159,12 +1159,12 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp, ...@@ -1159,12 +1159,12 @@ static uint32_t g4x_get_aux_send_ctl(struct intel_dp *intel_dp,
(aux_clock_divider << DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT); (aux_clock_divider << DP_AUX_CH_CTL_BIT_CLOCK_2X_SHIFT);
} }
static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp, static u32 skl_get_aux_send_ctl(struct intel_dp *intel_dp,
int send_bytes, int send_bytes,
uint32_t unused) u32 unused)
{ {
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
uint32_t ret; u32 ret;
ret = DP_AUX_CH_CTL_SEND_BUSY | ret = DP_AUX_CH_CTL_SEND_BUSY |
DP_AUX_CH_CTL_DONE | DP_AUX_CH_CTL_DONE |
...@@ -1184,19 +1184,19 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp, ...@@ -1184,19 +1184,19 @@ static uint32_t skl_get_aux_send_ctl(struct intel_dp *intel_dp,
static int static int
intel_dp_aux_xfer(struct intel_dp *intel_dp, intel_dp_aux_xfer(struct intel_dp *intel_dp,
const uint8_t *send, int send_bytes, const u8 *send, int send_bytes,
uint8_t *recv, int recv_size, u8 *recv, int recv_size,
u32 aux_send_ctl_flags) u32 aux_send_ctl_flags)
{ {
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
struct drm_i915_private *dev_priv = struct drm_i915_private *dev_priv =
to_i915(intel_dig_port->base.base.dev); to_i915(intel_dig_port->base.base.dev);
i915_reg_t ch_ctl, ch_data[5]; i915_reg_t ch_ctl, ch_data[5];
uint32_t aux_clock_divider; u32 aux_clock_divider;
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
int i, ret, recv_bytes; int i, ret, recv_bytes;
int try, clock = 0; int try, clock = 0;
uint32_t status; u32 status;
bool vdd; bool vdd;
ch_ctl = intel_dp->aux_ch_ctl_reg(intel_dp); ch_ctl = intel_dp->aux_ch_ctl_reg(intel_dp);
...@@ -1369,7 +1369,7 @@ static ssize_t ...@@ -1369,7 +1369,7 @@ static ssize_t
intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
{ {
struct intel_dp *intel_dp = container_of(aux, struct intel_dp, aux); struct intel_dp *intel_dp = container_of(aux, struct intel_dp, aux);
uint8_t txbuf[20], rxbuf[20]; u8 txbuf[20], rxbuf[20];
size_t txsize, rxsize; size_t txsize, rxsize;
int ret; int ret;
...@@ -1702,7 +1702,7 @@ int intel_dp_rate_select(struct intel_dp *intel_dp, int rate) ...@@ -1702,7 +1702,7 @@ int intel_dp_rate_select(struct intel_dp *intel_dp, int rate)
} }
void intel_dp_compute_rate(struct intel_dp *intel_dp, int port_clock, void intel_dp_compute_rate(struct intel_dp *intel_dp, int port_clock,
uint8_t *link_bw, uint8_t *rate_select) u8 *link_bw, u8 *rate_select)
{ {
/* eDP 1.4 rate select method. */ /* eDP 1.4 rate select method. */
if (intel_dp->use_rate_select) { if (intel_dp->use_rate_select) {
...@@ -2217,7 +2217,7 @@ intel_dp_compute_config(struct intel_encoder *encoder, ...@@ -2217,7 +2217,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,
} }
void intel_dp_set_link_params(struct intel_dp *intel_dp, void intel_dp_set_link_params(struct intel_dp *intel_dp,
int link_rate, uint8_t lane_count, int link_rate, u8 lane_count,
bool link_mst) bool link_mst)
{ {
intel_dp->link_trained = false; intel_dp->link_trained = false;
...@@ -3177,20 +3177,20 @@ static void chv_post_disable_dp(struct intel_encoder *encoder, ...@@ -3177,20 +3177,20 @@ static void chv_post_disable_dp(struct intel_encoder *encoder,
static void static void
_intel_dp_set_link_train(struct intel_dp *intel_dp, _intel_dp_set_link_train(struct intel_dp *intel_dp,
uint32_t *DP, u32 *DP,
uint8_t dp_train_pat) u8 dp_train_pat)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
enum port port = intel_dig_port->base.port; enum port port = intel_dig_port->base.port;
uint8_t train_pat_mask = drm_dp_training_pattern_mask(intel_dp->dpcd); u8 train_pat_mask = drm_dp_training_pattern_mask(intel_dp->dpcd);
if (dp_train_pat & train_pat_mask) if (dp_train_pat & train_pat_mask)
DRM_DEBUG_KMS("Using DP training pattern TPS%d\n", DRM_DEBUG_KMS("Using DP training pattern TPS%d\n",
dp_train_pat & train_pat_mask); dp_train_pat & train_pat_mask);
if (HAS_DDI(dev_priv)) { if (HAS_DDI(dev_priv)) {
uint32_t temp = I915_READ(DP_TP_CTL(port)); u32 temp = I915_READ(DP_TP_CTL(port));
if (dp_train_pat & DP_LINK_SCRAMBLING_DISABLE) if (dp_train_pat & DP_LINK_SCRAMBLING_DISABLE)
temp |= DP_TP_CTL_SCRAMBLE_DISABLE; temp |= DP_TP_CTL_SCRAMBLE_DISABLE;
...@@ -3289,7 +3289,7 @@ static void intel_enable_dp(struct intel_encoder *encoder, ...@@ -3289,7 +3289,7 @@ static void intel_enable_dp(struct intel_encoder *encoder,
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc); struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc);
uint32_t dp_reg = I915_READ(intel_dp->output_reg); u32 dp_reg = I915_READ(intel_dp->output_reg);
enum pipe pipe = crtc->pipe; enum pipe pipe = crtc->pipe;
intel_wakeref_t wakeref; intel_wakeref_t wakeref;
...@@ -3508,14 +3508,14 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder, ...@@ -3508,14 +3508,14 @@ static void chv_dp_post_pll_disable(struct intel_encoder *encoder,
* link status information * link status information
*/ */
bool bool
intel_dp_get_link_status(struct intel_dp *intel_dp, uint8_t link_status[DP_LINK_STATUS_SIZE]) intel_dp_get_link_status(struct intel_dp *intel_dp, u8 link_status[DP_LINK_STATUS_SIZE])
{ {
return drm_dp_dpcd_read(&intel_dp->aux, DP_LANE0_1_STATUS, link_status, return drm_dp_dpcd_read(&intel_dp->aux, DP_LANE0_1_STATUS, link_status,
DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE; DP_LINK_STATUS_SIZE) == DP_LINK_STATUS_SIZE;
} }
/* These are source-specific values. */ /* These are source-specific values. */
uint8_t u8
intel_dp_voltage_max(struct intel_dp *intel_dp) intel_dp_voltage_max(struct intel_dp *intel_dp)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
...@@ -3534,8 +3534,8 @@ intel_dp_voltage_max(struct intel_dp *intel_dp) ...@@ -3534,8 +3534,8 @@ intel_dp_voltage_max(struct intel_dp *intel_dp)
return DP_TRAIN_VOLTAGE_SWING_LEVEL_2; return DP_TRAIN_VOLTAGE_SWING_LEVEL_2;
} }
uint8_t u8
intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing) intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, u8 voltage_swing)
{ {
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
...@@ -3580,12 +3580,12 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing) ...@@ -3580,12 +3580,12 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing)
} }
} }
static uint32_t vlv_signal_levels(struct intel_dp *intel_dp) static u32 vlv_signal_levels(struct intel_dp *intel_dp)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
unsigned long demph_reg_value, preemph_reg_value, unsigned long demph_reg_value, preemph_reg_value,
uniqtranscale_reg_value; uniqtranscale_reg_value;
uint8_t train_set = intel_dp->train_set[0]; u8 train_set = intel_dp->train_set[0];
switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) { switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) {
case DP_TRAIN_PRE_EMPH_LEVEL_0: case DP_TRAIN_PRE_EMPH_LEVEL_0:
...@@ -3666,12 +3666,12 @@ static uint32_t vlv_signal_levels(struct intel_dp *intel_dp) ...@@ -3666,12 +3666,12 @@ static uint32_t vlv_signal_levels(struct intel_dp *intel_dp)
return 0; return 0;
} }
static uint32_t chv_signal_levels(struct intel_dp *intel_dp) static u32 chv_signal_levels(struct intel_dp *intel_dp)
{ {
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
u32 deemph_reg_value, margin_reg_value; u32 deemph_reg_value, margin_reg_value;
bool uniq_trans_scale = false; bool uniq_trans_scale = false;
uint8_t train_set = intel_dp->train_set[0]; u8 train_set = intel_dp->train_set[0];
switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) { switch (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) {
case DP_TRAIN_PRE_EMPH_LEVEL_0: case DP_TRAIN_PRE_EMPH_LEVEL_0:
...@@ -3749,10 +3749,10 @@ static uint32_t chv_signal_levels(struct intel_dp *intel_dp) ...@@ -3749,10 +3749,10 @@ static uint32_t chv_signal_levels(struct intel_dp *intel_dp)
return 0; return 0;
} }
static uint32_t static u32
g4x_signal_levels(uint8_t train_set) g4x_signal_levels(u8 train_set)
{ {
uint32_t signal_levels = 0; u32 signal_levels = 0;
switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) { switch (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) {
case DP_TRAIN_VOLTAGE_SWING_LEVEL_0: case DP_TRAIN_VOLTAGE_SWING_LEVEL_0:
...@@ -3788,8 +3788,8 @@ g4x_signal_levels(uint8_t train_set) ...@@ -3788,8 +3788,8 @@ g4x_signal_levels(uint8_t train_set)
} }
/* SNB CPU eDP voltage swing and pre-emphasis control */ /* SNB CPU eDP voltage swing and pre-emphasis control */
static uint32_t static u32
snb_cpu_edp_signal_levels(uint8_t train_set) snb_cpu_edp_signal_levels(u8 train_set)
{ {
int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK | int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |
DP_TRAIN_PRE_EMPHASIS_MASK); DP_TRAIN_PRE_EMPHASIS_MASK);
...@@ -3816,8 +3816,8 @@ snb_cpu_edp_signal_levels(uint8_t train_set) ...@@ -3816,8 +3816,8 @@ snb_cpu_edp_signal_levels(uint8_t train_set)
} }
/* IVB CPU eDP voltage swing and pre-emphasis control */ /* IVB CPU eDP voltage swing and pre-emphasis control */
static uint32_t static u32
ivb_cpu_edp_signal_levels(uint8_t train_set) ivb_cpu_edp_signal_levels(u8 train_set)
{ {
int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK | int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |
DP_TRAIN_PRE_EMPHASIS_MASK); DP_TRAIN_PRE_EMPHASIS_MASK);
...@@ -3852,8 +3852,8 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp) ...@@ -3852,8 +3852,8 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
enum port port = intel_dig_port->base.port; enum port port = intel_dig_port->base.port;
uint32_t signal_levels, mask = 0; u32 signal_levels, mask = 0;
uint8_t train_set = intel_dp->train_set[0]; u8 train_set = intel_dp->train_set[0];
if (IS_GEN9_LP(dev_priv) || INTEL_GEN(dev_priv) >= 10) { if (IS_GEN9_LP(dev_priv) || INTEL_GEN(dev_priv) >= 10) {
signal_levels = bxt_signal_levels(intel_dp); signal_levels = bxt_signal_levels(intel_dp);
...@@ -3892,7 +3892,7 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp) ...@@ -3892,7 +3892,7 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp)
void void
intel_dp_program_link_training_pattern(struct intel_dp *intel_dp, intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,
uint8_t dp_train_pat) u8 dp_train_pat)
{ {
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
struct drm_i915_private *dev_priv = struct drm_i915_private *dev_priv =
...@@ -3909,7 +3909,7 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp) ...@@ -3909,7 +3909,7 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp)
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
enum port port = intel_dig_port->base.port; enum port port = intel_dig_port->base.port;
uint32_t val; u32 val;
if (!HAS_DDI(dev_priv)) if (!HAS_DDI(dev_priv))
return; return;
...@@ -3944,7 +3944,7 @@ intel_dp_link_down(struct intel_encoder *encoder, ...@@ -3944,7 +3944,7 @@ intel_dp_link_down(struct intel_encoder *encoder,
struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base); struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc); struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
enum port port = encoder->port; enum port port = encoder->port;
uint32_t DP = intel_dp->DP; u32 DP = intel_dp->DP;
if (WARN_ON(HAS_DDI(dev_priv))) if (WARN_ON(HAS_DDI(dev_priv)))
return; return;
...@@ -4285,7 +4285,7 @@ intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *sink_irq_vector) ...@@ -4285,7 +4285,7 @@ intel_dp_get_sink_irq_esi(struct intel_dp *intel_dp, u8 *sink_irq_vector)
DP_DPRX_ESI_LEN; DP_DPRX_ESI_LEN;
} }
u16 intel_dp_dsc_get_output_bpp(int link_clock, uint8_t lane_count, u16 intel_dp_dsc_get_output_bpp(int link_clock, u8 lane_count,
int mode_clock, int mode_hdisplay) int mode_clock, int mode_hdisplay)
{ {
u16 bits_per_pixel, max_bpp_small_joiner_ram; u16 bits_per_pixel, max_bpp_small_joiner_ram;
...@@ -4352,7 +4352,7 @@ u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp, ...@@ -4352,7 +4352,7 @@ u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,
return 0; return 0;
} }
/* Also take into account max slice width */ /* Also take into account max slice width */
min_slice_count = min_t(uint8_t, min_slice_count, min_slice_count = min_t(u8, min_slice_count,
DIV_ROUND_UP(mode_hdisplay, DIV_ROUND_UP(mode_hdisplay,
max_slice_width)); max_slice_width));
...@@ -4370,11 +4370,11 @@ u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp, ...@@ -4370,11 +4370,11 @@ u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,
return 0; return 0;
} }
static uint8_t intel_dp_autotest_link_training(struct intel_dp *intel_dp) static u8 intel_dp_autotest_link_training(struct intel_dp *intel_dp)
{ {
int status = 0; int status = 0;
int test_link_rate; int test_link_rate;
uint8_t test_lane_count, test_link_bw; u8 test_lane_count, test_link_bw;
/* (DP CTS 1.2) /* (DP CTS 1.2)
* 4.3.1.11 * 4.3.1.11
*/ */
...@@ -4407,10 +4407,10 @@ static uint8_t intel_dp_autotest_link_training(struct intel_dp *intel_dp) ...@@ -4407,10 +4407,10 @@ static uint8_t intel_dp_autotest_link_training(struct intel_dp *intel_dp)
return DP_TEST_ACK; return DP_TEST_ACK;
} }
static uint8_t intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) static u8 intel_dp_autotest_video_pattern(struct intel_dp *intel_dp)
{ {
uint8_t test_pattern; u8 test_pattern;
uint8_t test_misc; u8 test_misc;
__be16 h_width, v_height; __be16 h_width, v_height;
int status = 0; int status = 0;
...@@ -4468,9 +4468,9 @@ static uint8_t intel_dp_autotest_video_pattern(struct intel_dp *intel_dp) ...@@ -4468,9 +4468,9 @@ static uint8_t intel_dp_autotest_video_pattern(struct intel_dp *intel_dp)
return DP_TEST_ACK; return DP_TEST_ACK;
} }
static uint8_t intel_dp_autotest_edid(struct intel_dp *intel_dp) static u8 intel_dp_autotest_edid(struct intel_dp *intel_dp)
{ {
uint8_t test_result = DP_TEST_ACK; u8 test_result = DP_TEST_ACK;
struct intel_connector *intel_connector = intel_dp->attached_connector; struct intel_connector *intel_connector = intel_dp->attached_connector;
struct drm_connector *connector = &intel_connector->base; struct drm_connector *connector = &intel_connector->base;
...@@ -4512,16 +4512,16 @@ static uint8_t intel_dp_autotest_edid(struct intel_dp *intel_dp) ...@@ -4512,16 +4512,16 @@ static uint8_t intel_dp_autotest_edid(struct intel_dp *intel_dp)
return test_result; return test_result;
} }
static uint8_t intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp) static u8 intel_dp_autotest_phy_pattern(struct intel_dp *intel_dp)
{ {
uint8_t test_result = DP_TEST_NAK; u8 test_result = DP_TEST_NAK;
return test_result; return test_result;
} }
static void intel_dp_handle_test_request(struct intel_dp *intel_dp) static void intel_dp_handle_test_request(struct intel_dp *intel_dp)
{ {
uint8_t response = DP_TEST_NAK; u8 response = DP_TEST_NAK;
uint8_t request = 0; u8 request = 0;
int status; int status;
status = drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_REQUEST, &request); status = drm_dp_dpcd_readb(&intel_dp->aux, DP_TEST_REQUEST, &request);
...@@ -4847,8 +4847,8 @@ static enum drm_connector_status ...@@ -4847,8 +4847,8 @@ static enum drm_connector_status
intel_dp_detect_dpcd(struct intel_dp *intel_dp) intel_dp_detect_dpcd(struct intel_dp *intel_dp)
{ {
struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp); struct intel_lspcon *lspcon = dp_to_lspcon(intel_dp);
uint8_t *dpcd = intel_dp->dpcd; u8 *dpcd = intel_dp->dpcd;
uint8_t type; u8 type;
if (lspcon->active) if (lspcon->active)
lspcon_resume(lspcon); lspcon_resume(lspcon);
...@@ -5630,7 +5630,7 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, ...@@ -5630,7 +5630,7 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,
.address = DP_AUX_HDCP_AKSV, .address = DP_AUX_HDCP_AKSV,
.size = DRM_HDCP_KSV_LEN, .size = DRM_HDCP_KSV_LEN,
}; };
uint8_t txbuf[HEADER_SIZE + DRM_HDCP_KSV_LEN] = {}, rxbuf[2], reply = 0; u8 txbuf[HEADER_SIZE + DRM_HDCP_KSV_LEN] = {}, rxbuf[2], reply = 0;
ssize_t dpcd_ret; ssize_t dpcd_ret;
int ret; int ret;
......
drivers/gpu/drm/i915/intel_dp_link_training.c
View file @ 830de422
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "intel_drv.h" #include "intel_drv.h"
static void static void
intel_dp_dump_link_status(const uint8_t link_status[DP_LINK_STATUS_SIZE]) intel_dp_dump_link_status(const u8 link_status[DP_LINK_STATUS_SIZE])
{ {
DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x", DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x",
...@@ -34,17 +34,17 @@ intel_dp_dump_link_status(const uint8_t link_status[DP_LINK_STATUS_SIZE]) ...@@ -34,17 +34,17 @@ intel_dp_dump_link_status(const uint8_t link_status[DP_LINK_STATUS_SIZE])
static void static void
intel_get_adjust_train(struct intel_dp *intel_dp, intel_get_adjust_train(struct intel_dp *intel_dp,
const uint8_t link_status[DP_LINK_STATUS_SIZE]) const u8 link_status[DP_LINK_STATUS_SIZE])
{ {
uint8_t v = 0; u8 v = 0;
uint8_t p = 0; u8 p = 0;
int lane; int lane;
uint8_t voltage_max; u8 voltage_max;
uint8_t preemph_max; u8 preemph_max;
for (lane = 0; lane < intel_dp->lane_count; lane++) { for (lane = 0; lane < intel_dp->lane_count; lane++) {
uint8_t this_v = drm_dp_get_adjust_request_voltage(link_status, lane); u8 this_v = drm_dp_get_adjust_request_voltage(link_status, lane);
uint8_t this_p = drm_dp_get_adjust_request_pre_emphasis(link_status, lane); u8 this_p = drm_dp_get_adjust_request_pre_emphasis(link_status, lane);
if (this_v > v) if (this_v > v)
v = this_v; v = this_v;
...@@ -66,9 +66,9 @@ intel_get_adjust_train(struct intel_dp *intel_dp, ...@@ -66,9 +66,9 @@ intel_get_adjust_train(struct intel_dp *intel_dp,
static bool static bool
intel_dp_set_link_train(struct intel_dp *intel_dp, intel_dp_set_link_train(struct intel_dp *intel_dp,
uint8_t dp_train_pat) u8 dp_train_pat)
{ {
uint8_t buf[sizeof(intel_dp->train_set) + 1]; u8 buf[sizeof(intel_dp->train_set) + 1];
int ret, len; int ret, len;
intel_dp_program_link_training_pattern(intel_dp, dp_train_pat); intel_dp_program_link_training_pattern(intel_dp, dp_train_pat);
...@@ -92,7 +92,7 @@ intel_dp_set_link_train(struct intel_dp *intel_dp, ...@@ -92,7 +92,7 @@ intel_dp_set_link_train(struct intel_dp *intel_dp,
static bool static bool
intel_dp_reset_link_train(struct intel_dp *intel_dp, intel_dp_reset_link_train(struct intel_dp *intel_dp,
uint8_t dp_train_pat) u8 dp_train_pat)
{ {
memset(intel_dp->train_set, 0, sizeof(intel_dp->train_set)); memset(intel_dp->train_set, 0, sizeof(intel_dp->train_set));
intel_dp_set_signal_levels(intel_dp); intel_dp_set_signal_levels(intel_dp);
...@@ -128,11 +128,11 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp) ...@@ -128,11 +128,11 @@ static bool intel_dp_link_max_vswing_reached(struct intel_dp *intel_dp)
static bool static bool
intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp) intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
{ {
uint8_t voltage; u8 voltage;
int voltage_tries, cr_tries, max_cr_tries; int voltage_tries, cr_tries, max_cr_tries;
bool max_vswing_reached = false; bool max_vswing_reached = false;
uint8_t link_config[2]; u8 link_config[2];
uint8_t link_bw, rate_select; u8 link_bw, rate_select;
if (intel_dp->prepare_link_retrain) if (intel_dp->prepare_link_retrain)
intel_dp->prepare_link_retrain(intel_dp); intel_dp->prepare_link_retrain(intel_dp);
...@@ -186,7 +186,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp) ...@@ -186,7 +186,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp)
voltage_tries = 1; voltage_tries = 1;
for (cr_tries = 0; cr_tries < max_cr_tries; ++cr_tries) { for (cr_tries = 0; cr_tries < max_cr_tries; ++cr_tries) {
uint8_t link_status[DP_LINK_STATUS_SIZE]; u8 link_status[DP_LINK_STATUS_SIZE];
drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd); drm_dp_link_train_clock_recovery_delay(intel_dp->dpcd);
...@@ -282,7 +282,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp) ...@@ -282,7 +282,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
{ {
int tries; int tries;
u32 training_pattern; u32 training_pattern;
uint8_t link_status[DP_LINK_STATUS_SIZE]; u8 link_status[DP_LINK_STATUS_SIZE];
bool channel_eq = false; bool channel_eq = false;
training_pattern = intel_dp_training_pattern(intel_dp); training_pattern = intel_dp_training_pattern(intel_dp);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7