diff --git a/dist b/dist index 9c0e36ec42a2d9bfefacb21ac6354c9ddd910533..535c6900412d365bb0ff6de8d1f27110833b3ae3 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8 +an8_7 diff --git a/linux-firmware.spec b/linux-firmware.spec index ab96e38326dc888802290712f46b5bfd583f1f93..6153666de930297c5a599fc6a661e0f520d651a6 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,6 +1,6 @@ %global checkout 150864a4 -%global firmware_release 110 +%global firmware_release 111 %global _firmwarepath /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 @@ -18,6 +18,8 @@ BuildArch: noarch # This is still causing problems in RHEL9 (see bug 1959913) and because of that we should keep out of RHEL8 too # 2) git archive --worktree-attributes --format=tar --prefix=linux-firmware-%%{checkout}/ %%{checkout} | xz > linux-firmware-%%{version}.tar.xz Source0: %{name}-%{version}.tar.xz +# Updated AMD GPU firmware from linux-firmware commit ba115d4589ee2792f00b779aab3ea00de7911f30 +Source1: yellow_carp_dmcub.bin Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0 Obsoletes: kernel-firmware < %{version} xorg-x11-drv-ati-firmware < 6.13.0-0.22 @@ -278,6 +280,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath} mkdir -p $RPM_BUILD_ROOT/%{_firmwarepath}/updates make DESTDIR=%{buildroot}/ FIRMWAREDIR=%{_firmwarepath} install +# Copy updated AMD GPU firmware into place +cp %{SOURCE1} $RPM_BUILD_ROOT/%{_firmwarepath}/amdgpu/ + pushd $RPM_BUILD_ROOT/%{_firmwarepath} # Remove firmware shipped in separate packages already # Perhaps these should be built as subpackages of linux-firmware? @@ -428,6 +433,9 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %config(noreplace) %{_firmwarepath}/netronome/nic_AMDA* %changelog +* Fri Feb 17 2023 Jarod Wilson - 20220726-111.git150864a4 +- Update AMD GPU firmware for multiple monitor fixes (rhbz 2165148) + * Tue Jul 26 2022 Jarod Wilson - 20220726-110.git150864a4 - Omit unused password-protected vxge firmware files from package (rhbz 2108051) - Pick up latest AMD GPU firmwares diff --git a/yellow_carp_dmcub.bin b/yellow_carp_dmcub.bin new file mode 100644 index 0000000000000000000000000000000000000000..8307a1978caaf697b5539d9cc729981d2de991c5 Binary files /dev/null and b/yellow_carp_dmcub.bin differ