diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2015-04-16 15:48:09 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-06-03 21:03:15 -0400 |
commit | 17b10f941f939da459072a066c6e5e9af9dda610 (patch) | |
tree | ce18d67c61bd146610e18c4d3edda18d65270fb7 /drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | |
parent | d38ceaf99ed015f2a0b9af3499791bd3a3daae21 (diff) |
drm/amdgpu: fix const warnings in amdgpu_connectors.c
Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Jammy Zhou <Jammy.Zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index 6a8d28f81780..27df17a0e620 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | |||
@@ -135,7 +135,7 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector) | |||
135 | if (connector->display_info.bpc) | 135 | if (connector->display_info.bpc) |
136 | bpc = connector->display_info.bpc; | 136 | bpc = connector->display_info.bpc; |
137 | else { | 137 | else { |
138 | struct drm_connector_helper_funcs *connector_funcs = | 138 | const struct drm_connector_helper_funcs *connector_funcs = |
139 | connector->helper_private; | 139 | connector->helper_private; |
140 | struct drm_encoder *encoder = connector_funcs->best_encoder(connector); | 140 | struct drm_encoder *encoder = connector_funcs->best_encoder(connector); |
141 | struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder); | 141 | struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder); |
@@ -216,7 +216,7 @@ amdgpu_connector_update_scratch_regs(struct drm_connector *connector, | |||
216 | { | 216 | { |
217 | struct drm_encoder *best_encoder = NULL; | 217 | struct drm_encoder *best_encoder = NULL; |
218 | struct drm_encoder *encoder = NULL; | 218 | struct drm_encoder *encoder = NULL; |
219 | struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; | 219 | const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; |
220 | bool connected; | 220 | bool connected; |
221 | int i; | 221 | int i; |
222 | 222 | ||
@@ -597,7 +597,7 @@ static int amdgpu_connector_set_property(struct drm_connector *connector, | |||
597 | if (connector->encoder) { | 597 | if (connector->encoder) { |
598 | amdgpu_encoder = to_amdgpu_encoder(connector->encoder); | 598 | amdgpu_encoder = to_amdgpu_encoder(connector->encoder); |
599 | } else { | 599 | } else { |
600 | struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; | 600 | const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; |
601 | amdgpu_encoder = to_amdgpu_encoder(connector_funcs->best_encoder(connector)); | 601 | amdgpu_encoder = to_amdgpu_encoder(connector_funcs->best_encoder(connector)); |
602 | } | 602 | } |
603 | 603 | ||
@@ -788,7 +788,7 @@ static int amdgpu_connector_set_lcd_property(struct drm_connector *connector, | |||
788 | if (connector->encoder) | 788 | if (connector->encoder) |
789 | amdgpu_encoder = to_amdgpu_encoder(connector->encoder); | 789 | amdgpu_encoder = to_amdgpu_encoder(connector->encoder); |
790 | else { | 790 | else { |
791 | struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; | 791 | const struct drm_connector_helper_funcs *connector_funcs = connector->helper_private; |
792 | amdgpu_encoder = to_amdgpu_encoder(connector_funcs->best_encoder(connector)); | 792 | amdgpu_encoder = to_amdgpu_encoder(connector_funcs->best_encoder(connector)); |
793 | } | 793 | } |
794 | 794 | ||
@@ -852,7 +852,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force) | |||
852 | { | 852 | { |
853 | struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); | 853 | struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); |
854 | struct drm_encoder *encoder; | 854 | struct drm_encoder *encoder; |
855 | struct drm_encoder_helper_funcs *encoder_funcs; | 855 | const struct drm_encoder_helper_funcs *encoder_funcs; |
856 | bool dret = false; | 856 | bool dret = false; |
857 | enum drm_connector_status ret = connector_status_disconnected; | 857 | enum drm_connector_status ret = connector_status_disconnected; |
858 | int r; | 858 | int r; |
@@ -971,7 +971,7 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) | |||
971 | struct amdgpu_device *adev = dev->dev_private; | 971 | struct amdgpu_device *adev = dev->dev_private; |
972 | struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); | 972 | struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); |
973 | struct drm_encoder *encoder = NULL; | 973 | struct drm_encoder *encoder = NULL; |
974 | struct drm_encoder_helper_funcs *encoder_funcs; | 974 | const struct drm_encoder_helper_funcs *encoder_funcs; |
975 | int i, r; | 975 | int i, r; |
976 | enum drm_connector_status ret = connector_status_disconnected; | 976 | enum drm_connector_status ret = connector_status_disconnected; |
977 | bool dret = false, broken_edid = false; | 977 | bool dret = false, broken_edid = false; |
@@ -1391,7 +1391,7 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) | |||
1391 | if (amdgpu_ddc_probe(amdgpu_connector, true)) /* try DDC */ | 1391 | if (amdgpu_ddc_probe(amdgpu_connector, true)) /* try DDC */ |
1392 | ret = connector_status_connected; | 1392 | ret = connector_status_connected; |
1393 | else if (amdgpu_connector->dac_load_detect) { /* try load detection */ | 1393 | else if (amdgpu_connector->dac_load_detect) { /* try load detection */ |
1394 | struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; | 1394 | const struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; |
1395 | ret = encoder_funcs->detect(encoder, connector); | 1395 | ret = encoder_funcs->detect(encoder, connector); |
1396 | } | 1396 | } |
1397 | } | 1397 | } |