Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-08-03 14:21:47 +0200
committerTakashi Iwai <tiwai@suse.de>2018-08-03 14:22:20 +0200
commita514876d058f3caea5ff1432ae0cec95b568ee1f (patch)
treea26582cdcb979dd8fa22821e98a0855eb159d37f
parent79caec472624b0db76196dfc0a777a4bcc5d1d7a (diff)
drm/radeon: fix mode_valid's return type (bsc#1051510).
-rw-r--r--patches.drivers/drm-radeon-fix-mode_valid-s-return-type74
-rw-r--r--series.conf1
2 files changed, 75 insertions, 0 deletions
diff --git a/patches.drivers/drm-radeon-fix-mode_valid-s-return-type b/patches.drivers/drm-radeon-fix-mode_valid-s-return-type
new file mode 100644
index 0000000000..4f3363b5c5
--- /dev/null
+++ b/patches.drivers/drm-radeon-fix-mode_valid-s-return-type
@@ -0,0 +1,74 @@
+From 7a47f20eb1fb8fa8d7a8fe3a4fd8c721f04c2174 Mon Sep 17 00:00:00 2001
+From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
+Date: Tue, 24 Apr 2018 15:15:13 +0200
+Subject: [PATCH] drm/radeon: fix mode_valid's return type
+Git-commit: 7a47f20eb1fb8fa8d7a8fe3a4fd8c721f04c2174
+Patch-mainline: v4.18-rc1
+References: bsc#1051510
+
+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.
+
+Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/gpu/drm/radeon/radeon_connectors.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
+index df9469a8fdb1..2aea2bdff99b 100644
+--- a/drivers/gpu/drm/radeon/radeon_connectors.c
++++ b/drivers/gpu/drm/radeon/radeon_connectors.c
+@@ -852,7 +852,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);
+@@ -1012,7 +1012,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;
+@@ -1156,7 +1156,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))
+@@ -1498,7 +1498,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;
+@@ -1800,7 +1800,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
+ 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;
+--
+2.18.0
+
diff --git a/series.conf b/series.conf
index e0808709cf..317ca2d731 100644
--- a/series.conf
+++ b/series.conf
@@ -14655,6 +14655,7 @@
patches.drivers/drm-amdgpu-Add-APU-support-in-vi_set_uvd_clocks
patches.drivers/drm-amdgpu-Add-APU-support-in-vi_set_vce_clocks
patches.drivers/drm-amdgpu-Remove-VRAM-from-shared-bo-domains
+ patches.drivers/drm-radeon-fix-mode_valid-s-return-type
patches.drivers/0001-drm-tegra-Acquire-a-reference-to-the-IOVA-cache.patch
patches.drivers/0001-gpu-host1x-Acquire-a-reference-to-the-IOVA-cache.patch
patches.drivers/drm-exynos-dsi-mask-frame-done-interrupt