Unverified Commit d7ff65e3 authored by Luna's avatar Luna Committed by GitHub
Browse files

rocmPackages: 7.0.2 -> 7.1.1 (#481349)

parents e8d3eb84 12c0d4c8
Loading
Loading
Loading
Loading
+5 −8
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch,
  rocmUpdateScript,
  cmake,
  pkg-config,
@@ -21,12 +20,12 @@ let
in
stdenv.mkDerivation (finalAttrs: {
  pname = "amdsmi";
  version = "7.0.2";
  version = "7.1.1";
  src = fetchFromGitHub {
    owner = "rocm";
    repo = "amdsmi";
    rev = "rocm-${finalAttrs.version}";
    hash = "sha256-1xQD68mrG1g9Bpw5/vxn+XxDM5HuAyEHyALyBixqR1s=";
    hash = "sha256-BGe3+8YFwu41ZVAF+VtN5Cn9pfzGxmCg/Rpq8qWOEoM=";
  };

  postPatch = ''
@@ -43,11 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  patches = [
    (fetchpatch {
      name = "fix-build-with-gcc15.patch";
      url = "https://github.com/ROCm/amdsmi/commit/902667db3cafe72e2009287cb96b160854ab9d81.patch";
      hash = "sha256-MoOY5q6tQ7Q+bgm/600Etz+cxRk4L2ujkarnBjnfANw=";
    })
    # Fix error: redefinition of 'struct drm_color_ctm_3x4'
    # https://github.com/ROCm/amdsmi/pull/165
    ./drm-struct-redefinition-fix.patch
  ];

  nativeBuildInputs = [
+35 −0
Original line number Diff line number Diff line
From b8b4a6bcfe35ba9539a120cfd16573123ddd9241 Mon Sep 17 00:00:00 2001
From: "Sv. Lockal" <lockalsash@gmail.com>
Date: Mon, 15 Dec 2025 03:46:35 +0800
Subject: [PATCH] Fix compilation with libdrm-2.4.130

Fix error: redefinition of 'struct drm_color_ctm_3x4'.

drm_color_ctm_3x4 structure is now defined in https://github.com/torvalds/linux/commit/e5719e7f19009d4fbedf685fc22eec9cd8de154f#diff-4c51fb416ec7cc69566cd7b795ee57eb070aa1006ad65d6962081f039ffb2718

As this structure is unused and not a part of amdsmi public interface,
it is safe to remove it.
---
 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
+3 −3
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@

stdenv.mkDerivation {
  pname = "aqlprofile";
  version = "7.0.2";
  version = "7.1.1";

  src = fetchFromGitHub {
    owner = "ROCm";
    repo = "aqlprofile";
    tag = "rocm-7.0.2";
    hash = "sha256-A17SAkEUf3yAGwvZUWSdL7Tn5YAXB0YlD3T1DLTjDSg=";
    tag = "rocm-7.1.1";
    hash = "sha256-MAZUHo52gb0aZSFnKugMlXxcDkmMwhy1AFF1RDRgRVk=";
  };

  env.CXXFLAGS = "-DROCP_LD_AQLPROFILE=1";
+7 −15
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
  pname = "clr";
  version = "7.0.2";
  version = "7.1.1";

  outputs = [
    "out"
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "ROCm";
    repo = "clr";
    rev = "rocm-${finalAttrs.version}";
    hash = "sha256-zajb/iTtF/ECRScdcQ85HPgq8DdIGqSinJoVyyi89bw=";
    hash = "sha256-ofsq1uqMixtum5C6cp/UgTDpgGPfj+rAd6PoDx5iLLw=";
  };

  nativeBuildInputs = [
@@ -147,14 +147,10 @@ stdenv.mkDerivation (finalAttrs: {
  patches = [
    ./cmake-find-x11-libgl.patch
    (fetchpatch {
      # [PATCH] improve rocclr isa compatibility check
      sha256 = "sha256-/QpB3Wqdhcq6lzyO/zOWzwQC0oYpesCICxnVx5CqbWg=";
      url = "https://github.com/GZGavinZhao/clr/commit/733ee38ef8ad5c84926970981821f446dfcb00af.patch";
    })
    (fetchpatch {
      # [PATCH] improve hipamd isa compatibility check
      sha256 = "sha256-FvZInw8PqB68ePxAGu45cWT/whD1xmprIA5wZb5OLcE=";
      url = "https://github.com/GZGavinZhao/clr/commit/1f0b54ee9b0de08f4dc8cd38b6728928b180048a.patch";
      # [PATCH] rocclr: Extend HIP ISA compatibility checks
      sha256 = "sha256-InUSIFI1MgkfocBEoZjO2BCgXNyfF10ehh9jkTtAPXs=";
      url = "https://github.com/GZGavinZhao/rocm-systems/commit/937dcfdd316b589509c061809186fe5451d22431.patch";
      relative = "projects/clr";
    })
  ];

@@ -174,10 +170,6 @@ stdenv.mkDerivation (finalAttrs: {
    substituteInPlace opencl/khronos/icd/loader/icd_platform.h \
      --replace-fail '#define ICD_VENDOR_PATH "/etc/OpenCL/vendors/";' \
                     '#define ICD_VENDOR_PATH "/run/opengl-driver/etc/OpenCL/vendors/";'

    # new unbundler has better error messages, defaulting it on
    substituteInPlace rocclr/utils/flags.hpp \
      --replace-fail "HIP_ALWAYS_USE_NEW_COMGR_UNBUNDLING_ACTION, false" "HIP_ALWAYS_USE_NEW_COMGR_UNBUNDLING_ACTION, true"
  '';

  postInstall = ''
@@ -245,7 +237,7 @@ stdenv.mkDerivation (finalAttrs: {
      "1100"
      "1101"
      "1102"
      # 7.x "1150"
      "1150" # Strix Point
      "1151" # Strix Halo
      # "12-generic"
      "1200" # RX 9060
+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  pname = "composable_kernel_base";
  version = "7.0.2";
  version = "7.1.1";

  outputs = [
    "out"
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "ROCm";
    repo = "composable_kernel";
    rev = "rocm-${finalAttrs.version}";
    hash = "sha256-Wql7PD3kg85AFXn7UaTKxhURyDPfVe/OUbR+udrqDc8=";
    hash = "sha256-exdkyTIK03dzlCXHm3j8ehEb9NxLOxPX9QyfMsiCgSs=";
  };

  nativeBuildInputs = [
Loading