From 31e458a3a89681485e645f36fb6ade1570a1dbae Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Mon, 12 Jan 2026 12:07:40 +0100 Subject: [PATCH] Fix compilation on openSUSE Tumbleweed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- include/amd_smi/impl/amdgpu_drm.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/amd_smi/impl/amdgpu_drm.h b/include/amd_smi/impl/amdgpu_drm.h index b56a5ac4b..0e483d13b 100644 --- a/include/amd_smi/impl/amdgpu_drm.h +++ b/include/amd_smi/impl/amdgpu_drm.h @@ -1625,15 +1625,6 @@ struct drm_amdgpu_info_uq_metadata { #define AMDGPU_FAMILY_GC_11_5_0 150 /* GC 11.5.0 */ #define AMDGPU_FAMILY_GC_12_0_0 152 /* GC 12.0.0 */ -/* FIXME wrong namespace! */ -struct drm_color_ctm_3x4 { - /* - * Conversion matrix with 3x4 dimensions in S31.32 sign-magnitude - * (not two's complement!) format. - */ - __u64 matrix[12]; -}; - #if defined(__cplusplus) } #endif