drm/radeon: fix mode_valid's return type
authorjsg <jsg@openbsd.org>
Mon, 20 Aug 2018 01:54:34 +0000 (01:54 +0000)
committerjsg <jsg@openbsd.org>
Mon, 20 Aug 2018 01:54:34 +0000 (01:54 +0000)
From Luc Van Oostenryck
1f5e33948005cd1b720fd58717bb971109432875 in linux 4.4.y/4.4.146
7a47f20eb1fb8fa8d7a8fe3a4fd8c721f04c2174 in mainline linux

sys/dev/pci/drm/radeon/radeon_connectors.c

index fa85264..ad69ad9 100644 (file)
@@ -843,7 +843,7 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)
        return ret;
 }
 
-static int radeon_lvds_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status radeon_lvds_mode_valid(struct drm_connector *connector,
                                  struct drm_display_mode *mode)
 {
        struct drm_encoder *encoder = radeon_best_single_encoder(connector);
@@ -986,7 +986,7 @@ static int radeon_vga_get_modes(struct drm_connector *connector)
        return ret;
 }
 
-static int radeon_vga_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status radeon_vga_mode_valid(struct drm_connector *connector,
                                  struct drm_display_mode *mode)
 {
        struct drm_device *dev = connector->dev;
@@ -1125,7 +1125,7 @@ static int radeon_tv_get_modes(struct drm_connector *connector)
        return 1;
 }
 
-static int radeon_tv_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status radeon_tv_mode_valid(struct drm_connector *connector,
                                struct drm_display_mode *mode)
 {
        if ((mode->hdisplay > 1024) || (mode->vdisplay > 768))
@@ -1456,7 +1456,7 @@ static void radeon_dvi_force(struct drm_connector *connector)
                radeon_connector->use_digital = true;
 }
 
-static int radeon_dvi_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status radeon_dvi_mode_valid(struct drm_connector *connector,
                                  struct drm_display_mode *mode)
 {
        struct drm_device *dev = connector->dev;
@@ -1753,7 +1753,7 @@ out:
        return ret;
 }
 
-static int radeon_dp_mode_valid(struct drm_connector *connector,
+static enum drm_mode_status radeon_dp_mode_valid(struct drm_connector *connector,
                                  struct drm_display_mode *mode)
 {
        struct drm_device *dev = connector->dev;