New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
wip: amdgpu-pro update #29698
Closed
Closed
wip: amdgpu-pro update #29698
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 8 additions & 8 deletions
16
pkgs/os-specific/linux/amdgpu-pro/patches/0001-disable-firmware-copy.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,25 @@ | ||
| From 704cef8638ffbdd8de9e57f28b43ea42c685ea87 Mon Sep 17 00:00:00 2001 | ||
| From 36b4ba44048aefb2a4d0096bc0ea1c4cc6fc5ef4 Mon Sep 17 00:00:00 2001 | ||
| From: David McFarland <corngood@gmail.com> | ||
| Date: Sat, 28 Jan 2017 16:57:26 -0400 | ||
| Subject: [PATCH 1/4] disable firmware copy | ||
| Subject: [PATCH] disable firmware copy | ||
|
|
||
| --- | ||
| pre-build.sh | 5 ----- | ||
| 1 file changed, 5 deletions(-) | ||
|
|
||
| diff --git a/pre-build.sh b/pre-build.sh | ||
| index 622ff13..e3cd009 100755 | ||
| index 35d53e5..3c9d7d1 100755 | ||
| --- a/pre-build.sh | ||
| +++ b/pre-build.sh | ||
| @@ -35,8 +35,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \ | ||
| @@ -38,8 +38,3 @@ find ttm -name '*.c' -exec grep EXPORT_SYMBOL {} + \ | ||
| | sort -u \ | ||
| | awk -F'[()]' '{print "#define "$2" amd"$2" //"$0}'\ | ||
| > include/rename_symbol.h | ||
| >> include/rename_symbol.h | ||
| - | ||
| -FW_DIR="/lib/firmware/$KERNELVER" | ||
| -mkdir -p $FW_DIR | ||
| -cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/radeon $FW_DIR | ||
| -cp -ar /usr/src/amdgpu-pro-17.10-401251/firmware/amdgpu $FW_DIR | ||
| -cp -ar /usr/src/amdgpu-pro-17.30-465504/firmware/radeon $FW_DIR | ||
| -cp -ar /usr/src/amdgpu-pro-17.30-465504/firmware/amdgpu $FW_DIR | ||
| -- | ||
| 2.12.2 | ||
| 2.14.1 | ||
|
|
130 changes: 130 additions & 0 deletions
130
pkgs/os-specific/linux/amdgpu-pro/patches/0002-fix-warnings-for-Werror.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| From f40ffb49ef0f8579c313ed895f9798c3e0e8b2a2 Mon Sep 17 00:00:00 2001 | ||
| From: David McFarland <corngood@gmail.com> | ||
| Date: Mon, 6 Feb 2017 22:13:49 -0400 | ||
| Subject: [PATCH 2/2] fix warnings for Werror | ||
|
|
||
| --- | ||
| amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 1 - | ||
| amd/amdgpu/amdgpu_sa.c | 2 +- | ||
| amd/amdgpu/dce_v10_0.c | 2 +- | ||
| amd/amdgpu/dce_v11_0.c | 2 +- | ||
| amd/amdgpu/dce_v6_0.c | 2 +- | ||
| amd/amdgpu/dce_v8_0.c | 2 +- | ||
| amd/amdkfd/kfd_chardev.c | 1 + | ||
| amd/display/dc/bios/bios_parser2.c | 8 ++++---- | ||
| 8 files changed, 10 insertions(+), 10 deletions(-) | ||
|
|
||
| diff --git a/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | ||
| index 0ff5027..c286100 100644 | ||
| --- a/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | ||
| +++ b/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | ||
| @@ -966,7 +966,6 @@ static int invalidate_tlbs_with_kiq(struct amdgpu_device *adev, uint16_t pasid) | ||
| signed long r; | ||
| struct fence *f; | ||
| struct amdgpu_ring *ring = &adev->gfx.kiq.ring; | ||
| - struct amdgpu_kiq *kiq = &adev->gfx.kiq; | ||
|
|
||
| mutex_lock(&adev->gfx.kiq.ring_mutex); | ||
| amdgpu_ring_alloc(ring, 12); /* fence + invalidate_tlbs package*/ | ||
| diff --git a/amd/amdgpu/amdgpu_sa.c b/amd/amdgpu/amdgpu_sa.c | ||
| index 401a20f..facadf3 100644 | ||
| --- a/amd/amdgpu/amdgpu_sa.c | ||
| +++ b/amd/amdgpu/amdgpu_sa.c | ||
| @@ -430,7 +430,7 @@ void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, | ||
| if (i->fence) | ||
| #if defined(BUILD_AS_DKMS) | ||
| seq_printf(m, " protected by 0x%08x on context %d", | ||
| - i->fence->seqno, i->fence->context); | ||
| + i->fence->seqno, (int)i->fence->context); | ||
| #else | ||
| seq_printf(m, " protected by 0x%08x on context %llu", | ||
| i->fence->seqno, i->fence->context); | ||
| diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c | ||
| index b41811d..89268d0 100644 | ||
| --- a/amd/amdgpu/dce_v10_0.c | ||
| +++ b/amd/amdgpu/dce_v10_0.c | ||
| @@ -2131,7 +2131,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc, | ||
| bypass_lut = true; | ||
| break; | ||
| default: | ||
| - format_name = kcl_drm_get_format_name(target_fb->pixel_format); | ||
| + format_name = (char*)kcl_drm_get_format_name(target_fb->pixel_format); | ||
| DRM_ERROR("Unsupported screen format %s\n", format_name); | ||
| kfree(format_name); | ||
| return -EINVAL; | ||
| diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c | ||
| index 82c8eba..24daa85 100644 | ||
| --- a/amd/amdgpu/dce_v11_0.c | ||
| +++ b/amd/amdgpu/dce_v11_0.c | ||
| @@ -2115,7 +2115,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc, | ||
| bypass_lut = true; | ||
| break; | ||
| default: | ||
| - format_name = kcl_drm_get_format_name(target_fb->pixel_format); | ||
| + format_name = (char*)kcl_drm_get_format_name(target_fb->pixel_format); | ||
| DRM_ERROR("Unsupported screen format %s\n", format_name); | ||
| kfree(format_name); | ||
| return -EINVAL; | ||
| diff --git a/amd/amdgpu/dce_v6_0.c b/amd/amdgpu/dce_v6_0.c | ||
| index 2d06b39..b0da814 100644 | ||
| --- a/amd/amdgpu/dce_v6_0.c | ||
| +++ b/amd/amdgpu/dce_v6_0.c | ||
| @@ -2064,7 +2064,7 @@ static int dce_v6_0_crtc_do_set_base(struct drm_crtc *crtc, | ||
| bypass_lut = true; | ||
| break; | ||
| default: | ||
| - format_name = kcl_drm_get_format_name(target_fb->pixel_format); | ||
| + format_name = (char*)kcl_drm_get_format_name(target_fb->pixel_format); | ||
| DRM_ERROR("Unsupported screen format %s\n", format_name); | ||
| kfree(format_name); | ||
| return -EINVAL; | ||
| diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c | ||
| index e32222c..f984040 100644 | ||
| --- a/amd/amdgpu/dce_v8_0.c | ||
| +++ b/amd/amdgpu/dce_v8_0.c | ||
| @@ -2002,7 +2002,7 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc *crtc, | ||
| bypass_lut = true; | ||
| break; | ||
| default: | ||
| - format_name = kcl_drm_get_format_name(target_fb->pixel_format); | ||
| + format_name = (char*)kcl_drm_get_format_name(target_fb->pixel_format); | ||
| DRM_ERROR("Unsupported screen format %s\n", format_name); | ||
| kfree(format_name); | ||
| return -EINVAL; | ||
| diff --git a/amd/amdkfd/kfd_chardev.c b/amd/amdkfd/kfd_chardev.c | ||
| index b01875e..a15cebc 100644 | ||
| --- a/amd/amdkfd/kfd_chardev.c | ||
| +++ b/amd/amdkfd/kfd_chardev.c | ||
| @@ -1755,6 +1755,7 @@ static int kfd_ioctl_get_tile_config(struct file *filep, | ||
| static int kfd_ioctl_cross_memory_copy(struct file *filep, | ||
| struct kfd_process *local_p, void *data) | ||
| { | ||
| + return 0; | ||
| } | ||
| #else | ||
| static int kfd_ioctl_cross_memory_copy(struct file *filep, | ||
| diff --git a/amd/display/dc/bios/bios_parser2.c b/amd/display/dc/bios/bios_parser2.c | ||
| index 682fc9b..6257220 100644 | ||
| --- a/amd/display/dc/bios/bios_parser2.c | ||
| +++ b/amd/display/dc/bios/bios_parser2.c | ||
| @@ -1317,13 +1317,13 @@ static enum bp_result get_embedded_panel_info_v2_1( | ||
| info->lcd_timing.misc_info.VERTICAL_CUT_OFF = 0; | ||
|
|
||
| info->lcd_timing.misc_info.H_REPLICATION_BY2 = | ||
| - lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2; | ||
| + (lvds->lcd_timing.miscinfo & ATOM_H_REPLICATIONBY2) != 0; | ||
| info->lcd_timing.misc_info.V_REPLICATION_BY2 = | ||
| - lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2; | ||
| + (lvds->lcd_timing.miscinfo & ATOM_V_REPLICATIONBY2) != 0; | ||
| info->lcd_timing.misc_info.COMPOSITE_SYNC = | ||
| - lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC; | ||
| + (lvds->lcd_timing.miscinfo & ATOM_COMPOSITESYNC) != 0; | ||
| info->lcd_timing.misc_info.INTERLACE = | ||
| - lvds->lcd_timing.miscinfo & ATOM_INTERLACE; | ||
| + (lvds->lcd_timing.miscinfo & ATOM_INTERLACE) != 0; | ||
|
|
||
| /* not provided by VBIOS*/ | ||
| info->lcd_timing.misc_info.DOUBLE_CLOCK = 0; | ||
| -- | ||
| 2.14.1 | ||
|
|
50 changes: 0 additions & 50 deletions
50
pkgs/os-specific/linux/amdgpu-pro/patches/0002-linux-4.9-fixes.patch
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
...-specific/linux/amdgpu-pro/patches/0003-Change-seq_printf-format-for-64-bit-context.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vcunat What do you think of this? It feels wrong, but this kernel module requires linux 4.10 w/
KALLSYMS_ALL=y, and I couldn't find a precedent for influencing the kernel config.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
First of all, 4.10 branch was killed upstream, and we already deleted it in nixpkgs as well. Second, just the fact of users having to build their own kernel would be quite a nuisance. Perhaps it would be good to look into the suitability of having the option in default kernels (say those > 4.9).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
4.13 is the only maintained branch newer than 4.9 ATM (4.9 is the latest longterm branch).