diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/4304-drm-admgpu-fix-mode_valid-s-return-type.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/4304-drm-admgpu-fix-mode_valid-s-return-type.patch | 103 |
1 files changed, 103 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/4304-drm-admgpu-fix-mode_valid-s-return-type.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/4304-drm-admgpu-fix-mode_valid-s-return-type.patch new file mode 100644 index 00000000..da4a1a66 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/4304-drm-admgpu-fix-mode_valid-s-return-type.patch @@ -0,0 +1,103 @@ +From de7d417043414cb86f8cfd00247c76c9ca628c88 Mon Sep 17 00:00:00 2001 +From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> +Date: Tue, 24 Apr 2018 15:14:18 +0200 +Subject: [PATCH 4304/5725] drm/admgpu: fix mode_valid's return type + +The method struct drm_connector_helper_funcs::mode_valid is defined +as returning an 'enum drm_mode_status' but the driver implementation +for this method uses an 'int' for it. + +Fix this by using 'enum drm_mode_status' in the driver too. + +Reviewed-by: Harry Wentland <harry.wentland@amd.com> +Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 8 ++++---- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- + 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 820d66b..c0b2ab9 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +@@ -694,7 +694,7 @@ static int amdgpu_connector_lvds_get_modes(struct drm_connector *connector) + return ret; + } + +-static int amdgpu_connector_lvds_mode_valid(struct drm_connector *connector, ++static enum drm_mode_status amdgpu_connector_lvds_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) + { + struct drm_encoder *encoder = amdgpu_connector_best_single_encoder(connector); +@@ -842,7 +842,7 @@ static int amdgpu_connector_vga_get_modes(struct drm_connector *connector) + return ret; + } + +-static int amdgpu_connector_vga_mode_valid(struct drm_connector *connector, ++static enum drm_mode_status amdgpu_connector_vga_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) + { + struct drm_device *dev = connector->dev; +@@ -1163,7 +1163,7 @@ static void amdgpu_connector_dvi_force(struct drm_connector *connector) + amdgpu_connector->use_digital = true; + } + +-static int amdgpu_connector_dvi_mode_valid(struct drm_connector *connector, ++static enum drm_mode_status amdgpu_connector_dvi_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) + { + struct drm_device *dev = connector->dev; +@@ -1435,7 +1435,7 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force) + return ret; + } + +-static int amdgpu_connector_dp_mode_valid(struct drm_connector *connector, ++static enum drm_mode_status amdgpu_connector_dp_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) + { + 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 bdcc7f8..6b8c746 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c +@@ -330,7 +330,7 @@ static int dce_virtual_get_modes(struct drm_connector *connector) + return 0; + } + +-static int dce_virtual_mode_valid(struct drm_connector *connector, ++static enum drm_mode_status dce_virtual_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) + { + 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 ab3fd8a..448fd0b 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -3009,7 +3009,7 @@ static void handle_edid_mgmt(struct amdgpu_dm_connector *aconnector) + create_eml_sink(aconnector); + } + +-int amdgpu_dm_connector_mode_valid(struct drm_connector *connector, ++enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) + { + 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 e66dabb..51c09a4 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +@@ -271,7 +271,7 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, + struct dc_link *link, + int link_index); + +-int amdgpu_dm_connector_mode_valid(struct drm_connector *connector, ++enum drm_mode_status amdgpu_dm_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode); + + void dm_restore_drm_connector_state(struct drm_device *dev, +-- +2.7.4 + |