diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3233-drm-amdgpu-rename-amdgpu_crtc_set_config.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3233-drm-amdgpu-rename-amdgpu_crtc_set_config.patch | 127 |
1 files changed, 127 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3233-drm-amdgpu-rename-amdgpu_crtc_set_config.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3233-drm-amdgpu-rename-amdgpu_crtc_set_config.patch new file mode 100644 index 00000000..5fec604c --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3233-drm-amdgpu-rename-amdgpu_crtc_set_config.patch @@ -0,0 +1,127 @@ +From c2c5817f487d71bca9056a093c1444e9696a6120 Mon Sep 17 00:00:00 2001 +From: Samuel Li <Samuel.Li@amd.com> +Date: Fri, 19 Jan 2018 11:53:31 -0500 +Subject: [PATCH 3233/4131] drm/amdgpu: rename amdgpu_crtc_set_config +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add display to the name for consistency. + +Signed-off-by: Samuel Li <Samuel.Li@amd.com> +Acked-by: Christian König <christian.koenig@amd.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> + +Conflicts: + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h + +Change-Id: I1ed3051b438d2fa0382fe96d703921dfd7eb6a06 +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 ++-- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +index f6e2e90..f15b98c 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +@@ -262,7 +262,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, + return r; + } + +-int amdgpu_crtc_set_config(struct drm_mode_set *set, ++int amdgpu_display_crtc_set_config(struct drm_mode_set *set, + struct drm_modeset_acquire_ctx *ctx) + { + struct drm_device *dev; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +index b0afe81..af77fc3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +@@ -685,10 +685,10 @@ int amdgpu_align_pitch(struct amdgpu_device *adev, int width, int bpp, bool tile + void amdgpu_print_display_setup(struct drm_device *dev); + int amdgpu_modeset_create_props(struct amdgpu_device *adev); + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) +-int amdgpu_crtc_set_config(struct drm_mode_set *set, ++int amdgpu_display_crtc_set_config(struct drm_mode_set *set, + struct drm_modeset_acquire_ctx *ctx); + #else +-int amdgpu_crtc_set_config(struct drm_mode_set *set); ++int amdgpu_display_crtc_set_config(struct drm_mode_set *set); + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) || defined(OS_NAME_RHEL_7_4) + int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +index 751b52f..a5d401a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +@@ -2517,7 +2517,7 @@ static const struct drm_crtc_funcs dce_v10_0_crtc_funcs = { + .cursor_set2 = dce_v10_0_crtc_cursor_set2, + .cursor_move = dce_v10_0_crtc_cursor_move, + .gamma_set = dce_v10_0_crtc_gamma_set, +- .set_config = amdgpu_crtc_set_config, ++ .set_config = amdgpu_display_crtc_set_config, + .destroy = dce_v10_0_crtc_destroy, + .page_flip_target = amdgpu_display_crtc_page_flip_target, + }; +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +index 6502e5f..90900f7 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +@@ -2592,7 +2592,7 @@ static const struct drm_crtc_funcs dce_v11_0_crtc_funcs = { + .cursor_set2 = dce_v11_0_crtc_cursor_set2, + .cursor_move = dce_v11_0_crtc_cursor_move, + .gamma_set = dce_v11_0_crtc_gamma_set, +- .set_config = amdgpu_crtc_set_config, ++ .set_config = amdgpu_display_crtc_set_config, + .destroy = dce_v11_0_crtc_destroy, + .page_flip_target = amdgpu_display_crtc_page_flip_target, + }; +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +index 433de9f..9d4eeeb 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +@@ -2407,7 +2407,7 @@ static const struct drm_crtc_funcs dce_v6_0_crtc_funcs = { + .cursor_set2 = dce_v6_0_crtc_cursor_set2, + .cursor_move = dce_v6_0_crtc_cursor_move, + .gamma_set = dce_v6_0_crtc_gamma_set, +- .set_config = amdgpu_crtc_set_config, ++ .set_config = amdgpu_display_crtc_set_config, + .destroy = dce_v6_0_crtc_destroy, + .page_flip_target = amdgpu_display_crtc_page_flip_target, + }; +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +index 0988751..6fb31aa 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +@@ -2421,7 +2421,7 @@ static const struct drm_crtc_funcs dce_v8_0_crtc_funcs = { + .cursor_set2 = dce_v8_0_crtc_cursor_set2, + .cursor_move = dce_v8_0_crtc_cursor_move, + .gamma_set = dce_v8_0_crtc_gamma_set, +- .set_config = amdgpu_crtc_set_config, ++ .set_config = amdgpu_display_crtc_set_config, + .destroy = dce_v8_0_crtc_destroy, + .page_flip_target = amdgpu_display_crtc_page_flip_target, + }; +diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c +index 7877139..40f1e54 100644 +--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c ++++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c +@@ -130,7 +130,7 @@ static const struct drm_crtc_funcs dce_virtual_crtc_funcs = { + .cursor_set2 = NULL, + .cursor_move = NULL, + .gamma_set = dce_virtual_crtc_gamma_set, +- .set_config = amdgpu_crtc_set_config, ++ .set_config = amdgpu_display_crtc_set_config, + .destroy = dce_virtual_crtc_destroy, + .page_flip_target = amdgpu_display_crtc_page_flip_target, + }; +-- +2.7.4 + |