From c8f829da28b4efc07afb3b7e7bef742fe747f0d0 Mon Sep 17 00:00:00 2001 From: Kiriti Gowda Date: Thu, 2 May 2024 17:55:29 -0700 Subject: [PATCH] RHEL - Fix (#21) [ROCm/rocjpeg commit: 57246bc40bab67b0384b2f6ff2e38efd610b3e6b] --- projects/rocjpeg/CHANGELOG.md | 2 ++ projects/rocjpeg/CMakeLists.txt | 4 ++-- projects/rocjpeg/README.md | 3 ++- projects/rocjpeg/rocJPEG-setup.py | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/rocjpeg/CHANGELOG.md b/projects/rocjpeg/CHANGELOG.md index d4160873b4..6ad51a43fc 100644 --- a/projects/rocjpeg/CHANGELOG.md +++ b/projects/rocjpeg/CHANGELOG.md @@ -22,6 +22,7 @@ Documentation for rocJPEG is available at ### Fixes * Package deps +* RHEL/SLES - Additional required packages `mesa-amdgpu-dri-drivers libdrm-amdgpu` ### Tested configurations @@ -33,4 +34,5 @@ Documentation for rocJPEG is available at * amdgpu-core - `1:6.1.60100-1741643` * libva-dev - `2.7.0-2` / `2.14.0-1` * mesa-amdgpu-va-drivers - `1:24.1.0` +* mesa-amdgpu-dri-drivers - `24.1.0.60200` * rocJPEG Setup Script - `V1.2.0` diff --git a/projects/rocjpeg/CMakeLists.txt b/projects/rocjpeg/CMakeLists.txt index 5708408551..2561a22165 100644 --- a/projects/rocjpeg/CMakeLists.txt +++ b/projects/rocjpeg/CMakeLists.txt @@ -184,9 +184,9 @@ if(HIP_FOUND AND Libva_FOUND) # Set the dependent packages set(rocJPEG_DEBIAN_PACKAGE_LIST "rocm-hip-runtime, libva2, libdrm-amdgpu1, mesa-amdgpu-va-drivers") - set(rocJPEG_RPM_PACKAGE_LIST "rocm-hip-runtime, libva, libdrm-amdgpu, mesa-amdgpu-va-drivers") + set(rocJPEG_RPM_PACKAGE_LIST "rocm-hip-runtime, libva, libdrm-amdgpu, mesa-amdgpu-va-drivers, mesa-amdgpu-dri-drivers") if(SLES_FOUND) - set(rocDecode_RPM_PACKAGE_LIST "rocm-hip-runtime, libva2, libdrm-amdgpu, mesa-amdgpu-va-drivers") + set(rocDecode_RPM_PACKAGE_LIST "rocm-hip-runtime, libva2, libdrm-amdgpu, mesa-amdgpu-va-drivers, mesa-amdgpu-dri-drivers") endif() set(rocJPEG_DEBIAN_DEV_PACKAGE_LIST "rocm-hip-runtime-dev, libva-dev, pkg-config") if(UBUNTU_22_FOUND) diff --git a/projects/rocjpeg/README.md b/projects/rocjpeg/README.md index b25c553d33..f7451d3e7e 100644 --- a/projects/rocjpeg/README.md +++ b/projects/rocjpeg/README.md @@ -60,7 +60,7 @@ rocJPEG is a high performance JPEG decode SDK for AMD GPUs. Using the rocJPEG AP > sudo apt install libstdc++-12-dev > ``` > -> * Additional RPM Packages required for `RHEL`/`SLES` - `libdrm-amdgpu` +> * Additional RPM Packages required for `RHEL`/`SLES` - `libdrm-amdgpu mesa-amdgpu-dri-drivers` >[!NOTE] > @@ -211,4 +211,5 @@ page. * amdgpu-core - `1:6.1.60100-1741643` * libva-dev - `2.7.0-2` / `2.14.0-1` * mesa-amdgpu-va-drivers - `1:24.1.0` +* mesa-amdgpu-dri-drivers - `24.1.0.60200` * rocJPEG Setup Script - `V1.2.0` diff --git a/projects/rocjpeg/rocJPEG-setup.py b/projects/rocjpeg/rocJPEG-setup.py index 18f24ce492..8fad689a9b 100644 --- a/projects/rocjpeg/rocJPEG-setup.py +++ b/projects/rocjpeg/rocJPEG-setup.py @@ -150,6 +150,7 @@ coreRPMPackages = [ 'libva-devel', 'libdrm-amdgpu', 'mesa-amdgpu-va-drivers', + 'mesa-amdgpu-dri-drivers', 'libva-utils' ]