2017-04-08 20:34:26 +02:00
|
|
|
From 0ead7017e1db18be971c24c891d4bdcc507deea7 Mon Sep 17 00:00:00 2001
|
2017-01-28 22:10:50 +01:00
|
|
|
From: David McFarland <corngood@gmail.com>
|
|
|
|
Date: Sun, 29 Jan 2017 18:23:47 -0400
|
|
|
|
Subject: [PATCH 2/4] linux-4.9 fixes
|
|
|
|
|
|
|
|
---
|
2017-04-08 20:34:26 +02:00
|
|
|
amd/amdkcl/kcl_io.c | 2 ++
|
2017-01-28 22:10:50 +01:00
|
|
|
amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 ++++++++
|
2017-04-08 20:34:26 +02:00
|
|
|
2 files changed, 10 insertions(+)
|
2017-01-28 22:10:50 +01:00
|
|
|
|
2017-04-08 20:34:26 +02:00
|
|
|
diff --git a/amd/amdkcl/kcl_io.c b/amd/amdkcl/kcl_io.c
|
|
|
|
index d8f843f..9a1bd9b 100644
|
|
|
|
--- a/amd/amdkcl/kcl_io.c
|
|
|
|
+++ b/amd/amdkcl/kcl_io.c
|
|
|
|
@@ -31,4 +31,6 @@ void amdkcl_io_init(void)
|
|
|
|
_kcl_io_free_memtype = amdkcl_fp_setup("io_free_memtype", NULL);
|
2017-01-28 22:10:50 +01:00
|
|
|
}
|
2017-04-08 20:34:26 +02:00
|
|
|
#endif
|
|
|
|
+#else
|
|
|
|
+void amdkcl_io_init(void) {}
|
|
|
|
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) */
|
2017-01-28 22:10:50 +01:00
|
|
|
diff --git a/amd/display/amdgpu_dm/amdgpu_dm_types.c b/amd/display/amdgpu_dm/amdgpu_dm_types.c
|
2017-04-08 20:34:26 +02:00
|
|
|
index 34313a9..44a4a71 100644
|
2017-01-28 22:10:50 +01:00
|
|
|
--- a/amd/display/amdgpu_dm/amdgpu_dm_types.c
|
|
|
|
+++ b/amd/display/amdgpu_dm/amdgpu_dm_types.c
|
2017-04-08 20:34:26 +02:00
|
|
|
@@ -1720,6 +1720,10 @@ static int dm_plane_helper_prepare_fb(
|
|
|
|
static int dm_plane_helper_prepare_fb(
|
2017-01-28 22:10:50 +01:00
|
|
|
struct drm_plane *plane,
|
|
|
|
const struct drm_plane_state *new_state)
|
|
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
|
|
|
|
+static int dm_plane_helper_prepare_fb(
|
|
|
|
+ struct drm_plane *plane,
|
|
|
|
+ struct drm_plane_state *new_state)
|
|
|
|
#else
|
|
|
|
static int dm_plane_helper_prepare_fb(
|
|
|
|
struct drm_plane *plane,
|
2017-04-08 20:34:26 +02:00
|
|
|
@@ -1766,6 +1770,10 @@ static void dm_plane_helper_cleanup_fb(
|
|
|
|
static void dm_plane_helper_cleanup_fb(
|
2017-01-28 22:10:50 +01:00
|
|
|
struct drm_plane *plane,
|
|
|
|
const struct drm_plane_state *old_state)
|
|
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
|
|
|
|
+static void dm_plane_helper_cleanup_fb(
|
|
|
|
+ struct drm_plane *plane,
|
|
|
|
+ struct drm_plane_state *old_state)
|
|
|
|
#else
|
|
|
|
static void dm_plane_helper_cleanup_fb(
|
|
|
|
struct drm_plane *plane,
|
|
|
|
--
|
2017-04-08 20:34:26 +02:00
|
|
|
2.12.2
|
2017-01-28 22:10:50 +01:00
|
|
|
|