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

drm/i915: s/intel_dp_aux_ch/intel_dp_aux_xfer/

Rename intel_dp_aux_ch() to intel_dp_aux_xfer() to better convey
what it actually does.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180222181036.15251-6-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #irc
parent fee0fddc
...@@ -1085,9 +1085,9 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp, ...@@ -1085,9 +1085,9 @@ static uint32_t intel_dp_get_aux_send_ctl(struct intel_dp *intel_dp,
} }
static int static int
intel_dp_aux_ch(struct intel_dp *intel_dp, intel_dp_aux_xfer(struct intel_dp *intel_dp,
const uint8_t *send, int send_bytes, const uint8_t *send, int send_bytes,
uint8_t *recv, int recv_size, bool aksv_write) uint8_t *recv, int recv_size, bool aksv_write)
{ {
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 =
...@@ -1284,8 +1284,8 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) ...@@ -1284,8 +1284,8 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
if (msg->buffer) if (msg->buffer)
memcpy(txbuf + HEADER_SIZE, msg->buffer, msg->size); memcpy(txbuf + HEADER_SIZE, msg->buffer, msg->size);
ret = intel_dp_aux_ch(intel_dp, txbuf, txsize, rxbuf, rxsize, ret = intel_dp_aux_xfer(intel_dp, txbuf, txsize,
false); rxbuf, rxsize, false);
if (ret > 0) { if (ret > 0) {
msg->reply = rxbuf[0] >> 4; msg->reply = rxbuf[0] >> 4;
...@@ -1307,8 +1307,8 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) ...@@ -1307,8 +1307,8 @@ intel_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg)
if (WARN_ON(rxsize > 20)) if (WARN_ON(rxsize > 20))
return -E2BIG; return -E2BIG;
ret = intel_dp_aux_ch(intel_dp, txbuf, txsize, rxbuf, rxsize, ret = intel_dp_aux_xfer(intel_dp, txbuf, txsize,
false); rxbuf, rxsize, false);
if (ret > 0) { if (ret > 0) {
msg->reply = rxbuf[0] >> 4; msg->reply = rxbuf[0] >> 4;
/* /*
...@@ -5045,8 +5045,8 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, ...@@ -5045,8 +5045,8 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,
txbuf[2] = DP_AUX_HDCP_AKSV & 0xff; txbuf[2] = DP_AUX_HDCP_AKSV & 0xff;
txbuf[3] = DRM_HDCP_KSV_LEN - 1; txbuf[3] = DRM_HDCP_KSV_LEN - 1;
ret = intel_dp_aux_ch(intel_dp, txbuf, sizeof(txbuf), rxbuf, ret = intel_dp_aux_xfer(intel_dp, txbuf, sizeof(txbuf),
sizeof(rxbuf), true); rxbuf, sizeof(rxbuf), true);
if (ret < 0) { if (ret < 0) {
DRM_ERROR("Write Aksv over DP/AUX failed (%d)\n", ret); DRM_ERROR("Write Aksv over DP/AUX failed (%d)\n", ret);
return ret; return ret;
......
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