aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_virtual.c2
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c2
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h2
4 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 96501ff0e55b..8e66851eb427 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -691,7 +691,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector)
691 return ret; 691 return ret;
692} 692}
693 693
694static int amdgpu_connector_lvds_mode_valid(struct drm_connector *connector, 694static enum drm_mode_status amdgpu_connector_lvds_mode_valid(struct drm_connector *connector,
695 struct drm_display_mode *mode) 695 struct drm_display_mode *mode)
696{ 696{
697 struct drm_encoder *encoder = amdgpu_connector_best_single_encoder(connector); 697 struct drm_encoder *encoder = amdgpu_connector_best_single_encoder(connector);
@@ -843,7 +843,7 @@ static int amdgpu_connector_vga_get_modes(struct drm_connector *connector)
843 return ret; 843 return ret;
844} 844}
845 845
846static int amdgpu_connector_vga_mode_valid(struct drm_connector *connector, 846static enum drm_mode_status amdgpu_connector_vga_mode_valid(struct drm_connector *connector,
847 struct drm_display_mode *mode) 847 struct drm_display_mode *mode)
848{ 848{
849 struct drm_device *dev = connector->dev; 849 struct drm_device *dev = connector->dev;
@@ -1172,7 +1172,7 @@ static void amdgpu_connector_dvi_force(struct drm_connector *connector)
1172 amdgpu_connector->use_digital = true; 1172 amdgpu_connector->use_digital = true;
1173} 1173}
1174 1174
1175static int amdgpu_connector_dvi_mode_valid(struct drm_connector *connector, 1175static enum drm_mode_status amdgpu_connector_dvi_mode_valid(struct drm_connector *connector,
1176 struct drm_display_mode *mode) 1176 struct drm_display_mode *mode)
1177{ 1177{
1178 struct drm_device *dev = connector->dev; 1178 struct drm_device *dev = connector->dev;
@@ -1448,7 +1448,7 @@ out:
1448 return ret; 1448 return ret;
1449} 1449}
1450 1450
1451static int amdgpu_connector_dp_mode_valid(struct drm_connector *connector, 1451static enum drm_mode_status amdgpu_connector_dp_mode_valid(struct drm_connector *connector,
1452 struct drm_display_mode *mode) 1452 struct drm_display_mode *mode)
1453{ 1453{
1454 struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector); 1454 struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index 89b2286a9d6b..6454cc371f57 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
@@ -327,7 +327,7 @@ static int dce_virtual_get_modes(struct drm_connector *connector)
327 return 0; 327 return 0;
328} 328}
329 329
330static int dce_virtual_mode_valid(struct drm_connector *connector, 330static enum drm_mode_status dce_virtual_mode_valid(struct drm_connector *connector,
331 struct drm_display_mode *mode) 331 struct drm_display_mode *mode)
332{ 332{
333 return MODE_OK; 333 return MODE_OK;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 28d8c08efeeb..656a01891f6c 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2838,7 +2838,7 @@ static void handle_edid_mgmt(struct amdgpu_dm_connector *aconnector)
2838 create_eml_sink(aconnector); 2838 create_eml_sink(aconnector);
2839} 2839}
2840 2840
2841int amdgpu_dm_connector_mode_valid(struct drm_connector *connector, 2841enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connector,
2842 struct drm_display_mode *mode) 2842 struct drm_display_mode *mode)
2843{ 2843{
2844 int result = MODE_ERROR; 2844 int result = MODE_ERROR;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index 005cf0d2dc34..d5aa89ad5571 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -247,7 +247,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm,
247 struct dc_link *link, 247 struct dc_link *link,
248 int link_index); 248 int link_index);
249 249
250int amdgpu_dm_connector_mode_valid(struct drm_connector *connector, 250enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connector,
251 struct drm_display_mode *mode); 251 struct drm_display_mode *mode);
252 252
253void dm_restore_drm_connector_state(struct drm_device *dev, 253void dm_restore_drm_connector_state(struct drm_device *dev,