aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorRodrigo Vivi <rodrigo.vivi@intel.com>2014-11-14 11:52:27 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-11-17 13:12:22 -0500
commita4f1289eaacdc2651355201b1ddded91710c89a2 (patch)
tree886ea7ac0883db931f9a9d42082ebc3ecbe0291d /drivers/gpu/drm
parent2fe486c7eae9fc5b52297aed0e4008df6b66b01c (diff)
drm/i915: Make dp aux pack/unpack public outside intel_dp.c
No functional change. Just making it public for use outside intel_dp.c Allowing split psr functions. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a16193fbfd49..a89585d809be 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -227,8 +227,7 @@ intel_dp_mode_valid(struct drm_connector *connector,
227 return MODE_OK; 227 return MODE_OK;
228} 228}
229 229
230static uint32_t 230uint32_t intel_dp_pack_aux(const uint8_t *src, int src_bytes)
231pack_aux(const uint8_t *src, int src_bytes)
232{ 231{
233 int i; 232 int i;
234 uint32_t v = 0; 233 uint32_t v = 0;
@@ -240,8 +239,7 @@ pack_aux(const uint8_t *src, int src_bytes)
240 return v; 239 return v;
241} 240}
242 241
243static void 242void intel_dp_unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes)
244unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes)
245{ 243{
246 int i; 244 int i;
247 if (dst_bytes > 4) 245 if (dst_bytes > 4)
@@ -863,7 +861,8 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
863 /* Load the send data into the aux channel data registers */ 861 /* Load the send data into the aux channel data registers */
864 for (i = 0; i < send_bytes; i += 4) 862 for (i = 0; i < send_bytes; i += 4)
865 I915_WRITE(ch_data + i, 863 I915_WRITE(ch_data + i,
866 pack_aux(send + i, send_bytes - i)); 864 intel_dp_pack_aux(send + i,
865 send_bytes - i));
867 866
868 /* Send the command and wait for it to complete */ 867 /* Send the command and wait for it to complete */
869 I915_WRITE(ch_ctl, send_ctl); 868 I915_WRITE(ch_ctl, send_ctl);
@@ -917,8 +916,8 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
917 recv_bytes = recv_size; 916 recv_bytes = recv_size;
918 917
919 for (i = 0; i < recv_bytes; i += 4) 918 for (i = 0; i < recv_bytes; i += 4)
920 unpack_aux(I915_READ(ch_data + i), 919 intel_dp_unpack_aux(I915_READ(ch_data + i),
921 recv + i, recv_bytes - i); 920 recv + i, recv_bytes - i);
922 921
923 ret = recv_bytes; 922 ret = recv_bytes;
924out: 923out:
@@ -2159,7 +2158,7 @@ static void intel_edp_psr_enable_sink(struct intel_dp *intel_dp)
2159 /* Setup AUX registers */ 2158 /* Setup AUX registers */
2160 for (i = 0; i < sizeof(aux_msg); i += 4) 2159 for (i = 0; i < sizeof(aux_msg); i += 4)
2161 I915_WRITE(EDP_PSR_AUX_DATA1(dev) + i, 2160 I915_WRITE(EDP_PSR_AUX_DATA1(dev) + i,
2162 pack_aux(&aux_msg[i], sizeof(aux_msg) - i)); 2161 intel_dp_pack_aux(&aux_msg[i], sizeof(aux_msg) - i));
2163 2162
2164 I915_WRITE(EDP_PSR_AUX_CTL(dev), 2163 I915_WRITE(EDP_PSR_AUX_CTL(dev),
2165 DP_AUX_CH_CTL_TIME_OUT_400us | 2164 DP_AUX_CH_CTL_TIME_OUT_400us |