Fix compilation on openSUSE Tumbleweed#171
Open
bmwiedemann wants to merge 1 commit intoROCm:amd-mainlinefrom
Open
Fix compilation on openSUSE Tumbleweed#171bmwiedemann wants to merge 1 commit intoROCm:amd-mainlinefrom
bmwiedemann wants to merge 1 commit intoROCm:amd-mainlinefrom
Conversation
Without this patch, compilation of amd_smi_gpu_device.cc failed with
In file included from /home/abuild/rpmbuild/BUILD/amdsmi-6.4.2-build/amdsmi-rocm-6.4.2/include/amd_smi/impl/amd_smi_drm.h:35,
from /home/abuild/rpmbuild/BUILD/amdsmi-6.4.2-build/amdsmi-rocm-6.4.2/include/amd_smi/impl/amd_smi_gpu_device.h:28,
from /home/abuild/rpmbuild/BUILD/amdsmi-6.4.2-build/amdsmi-rocm-6.4.2/src/amd_smi/amd_smi_gpu_device.cc:30:
/home/abuild/rpmbuild/BUILD/amdsmi-6.4.2-build/amdsmi-rocm-6.4.2/include/amd_smi/impl/amdgpu_drm.h:1309:8: error: redefinition of ‘struct drm_color_ctm_3x4’
1309 | struct drm_color_ctm_3x4 {
| ^~~~~~~~~~~~~~~~~
In file included from /usr/include/libdrm/drm.h:1082,
from /home/abuild/rpmbuild/BUILD/amdsmi-6.4.2-build/amdsmi-rocm-6.4.2/include/amd_smi/impl/amdgpu_drm.h:39:
/usr/include/libdrm/drm_mode.h:850:8: note: previous definition of ‘struct drm_color_ctm_3x4’
850 | struct drm_color_ctm_3x4 {
| ^~~~~~~~~~~~~~~~~
I tested that compilation for older Leap 15.6 still works with this patch
bmwiedemann
requested review from
bill-shuzhou-liu,
charis-poag-amd,
dmitrii-galantsev,
marifamd and
oliveiradan
as code owners
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Motivation
Without this patch, compilation of
amd_smi_gpu_device.ccfailed withTechnical Details
Test Plan
I tested compilation for older openSUSE Leap 15.6 and new openSUSE Tumbleweed.
Test Result
compilation still works for tested builds.
Submission Checklist