aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-10-11 09:44:50 -0400
committerDave Airlie <airlied@redhat.com>2017-10-16 20:43:02 -0400
commitaaa6346d75e2eaee715f36dd3b88a2a865663235 (patch)
tree8b32d3765adf0185f94a6734f6bb67a614ad6937
parent8ceb1cab8ec4d0beeac42714e27eb681f0afdd1d (diff)
drm/amd/display: whitespace cleanup in amdgpu_dm_mst_types.c/h
To match kernel standards. No intended functional change. Reviewed-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c39
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h5
2 files changed, 22 insertions, 22 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 343645e4070b..eed316a8b096 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -57,10 +57,10 @@ static inline char *side_band_msg_type_to_str(uint32_t address)
57} 57}
58 58
59void log_dpcd(uint8_t type, 59void log_dpcd(uint8_t type,
60 uint32_t address, 60 uint32_t address,
61 uint8_t *data, 61 uint8_t *data,
62 uint32_t size, 62 uint32_t size,
63 bool res) 63 bool res)
64{ 64{
65 DRM_DEBUG_KMS("Op: %s, addr: %04x, SideBand Msg: %s, Op res: %s\n", 65 DRM_DEBUG_KMS("Op: %s, addr: %04x, SideBand Msg: %s, Op res: %s\n",
66 (type == DP_AUX_NATIVE_READ) || 66 (type == DP_AUX_NATIVE_READ) ||
@@ -77,9 +77,11 @@ void log_dpcd(uint8_t type,
77} 77}
78#endif 78#endif
79 79
80static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) 80static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux,
81 struct drm_dp_aux_msg *msg)
81{ 82{
82 enum i2c_mot_mode mot = (msg->request & DP_AUX_I2C_MOT) ? I2C_MOT_TRUE : I2C_MOT_FALSE; 83 enum i2c_mot_mode mot = (msg->request & DP_AUX_I2C_MOT) ?
84 I2C_MOT_TRUE : I2C_MOT_FALSE;
83 enum ddc_result res; 85 enum ddc_result res;
84 86
85 switch (msg->request & ~DP_AUX_I2C_MOT) { 87 switch (msg->request & ~DP_AUX_I2C_MOT) {
@@ -125,10 +127,10 @@ static ssize_t dm_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg
125 127
126#ifdef TRACE_DPCD 128#ifdef TRACE_DPCD
127 log_dpcd(msg->request, 129 log_dpcd(msg->request,
128 msg->address, 130 msg->address,
129 msg->buffer, 131 msg->buffer,
130 msg->size, 132 msg->size,
131 r == DDC_RESULT_SUCESSFULL); 133 r == DDC_RESULT_SUCESSFULL);
132#endif 134#endif
133 135
134 return msg->size; 136 return msg->size;
@@ -229,9 +231,10 @@ dm_dp_create_fake_mst_encoder(struct amdgpu_dm_connector *connector)
229 return amdgpu_encoder; 231 return amdgpu_encoder;
230} 232}
231 233
232static struct drm_connector *dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr, 234static struct drm_connector *
233 struct drm_dp_mst_port *port, 235dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
234 const char *pathprop) 236 struct drm_dp_mst_port *port,
237 const char *pathprop)
235{ 238{
236 struct amdgpu_dm_connector *master = container_of(mgr, struct amdgpu_dm_connector, mst_mgr); 239 struct amdgpu_dm_connector *master = container_of(mgr, struct amdgpu_dm_connector, mst_mgr);
237 struct drm_device *dev = master->base.dev; 240 struct drm_device *dev = master->base.dev;
@@ -311,9 +314,8 @@ static struct drm_connector *dm_dp_add_mst_connector(struct drm_dp_mst_topology_
311 return connector; 314 return connector;
312} 315}
313 316
314static void dm_dp_destroy_mst_connector( 317static void dm_dp_destroy_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
315 struct drm_dp_mst_topology_mgr *mgr, 318 struct drm_connector *connector)
316 struct drm_connector *connector)
317{ 319{
318 struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector); 320 struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector);
319 321
@@ -438,9 +440,8 @@ static const struct drm_dp_mst_topology_cbs dm_mst_cbs = {
438 .register_connector = dm_dp_mst_register_connector 440 .register_connector = dm_dp_mst_register_connector
439}; 441};
440 442
441void amdgpu_dm_initialize_dp_connector( 443void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
442 struct amdgpu_display_manager *dm, 444 struct amdgpu_dm_connector *aconnector)
443 struct amdgpu_dm_connector *aconnector)
444{ 445{
445 aconnector->dm_dp_aux.aux.name = "dmdc"; 446 aconnector->dm_dp_aux.aux.name = "dmdc";
446 aconnector->dm_dp_aux.aux.dev = dm->adev->dev; 447 aconnector->dm_dp_aux.aux.dev = dm->adev->dev;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
index ba64a408d79c..2da851b40042 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.h
@@ -29,8 +29,7 @@
29struct amdgpu_display_manager; 29struct amdgpu_display_manager;
30struct amdgpu_dm_connector; 30struct amdgpu_dm_connector;
31 31
32void amdgpu_dm_initialize_dp_connector( 32void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
33 struct amdgpu_display_manager *dm, 33 struct amdgpu_dm_connector *aconnector);
34 struct amdgpu_dm_connector *aconnector);
35 34
36#endif 35#endif