Skip to content

Fedora 40, kernel >=6.9.9-200 (release) patches 0002 and 0003 do not apply. #39

Open
@Gregregorovich

Description

@Gregregorovich

Running Fedora 40, patching the latest kernel released to the package manager (6.9.9-200) does not apply the second nor third patches.

Hardware (presumably it's relevant?) :

  • R9 7900X (kernel driver amdgpu, has integrated Raphael graphics)
  • AMD RX 5600 XT (kernel driver amdgpu, second x16 slot, PCIe Gen IV x4 - Linux GPU, what I'm trying to get the VP2 to work on, default GPU for KDE 6 on Wayland)
  • (RTX 3080 Ti - kernel driver vfio-pci, primary slot, PCIe Gen IV x16, Windows KVM GPU)

Output of fedpkg --release f40 local is as follows:

Not downloading unused kernel-abi-stablelists-6.6.0.tar.bz2
Not downloading unused kernel-kabi-dw-6.6.0.tar.bz2
Not downloading already downloaded linux-6.9.9.tar.xz
Not downloading already downloaded kernel-abi-stablelists-6.9.9.tar.xz
Not downloading already downloaded kernel-kabi-dw-6.9.9.tar.xz

setting SOURCE_DATE_EPOCH=1720656000
Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.raxI6p
+ umask 022
+ cd /home/jarvis/kernel
kernel.spec:1730: Start of prep stage
kernel.spec:1732: Sanity checks
+ patch_command='git --work-tree=. apply'
kernel.spec:1789: Untar kernel tarball
+ cd /home/jarvis/kernel
+ rm -rf kernel-6.9.9
+ /usr/bin/mkdir -p kernel-6.9.9
+ cd kernel-6.9.9
+ /usr/lib/rpm/rpmuncompress -x /home/jarvis/kernel/linux-6.9.9.tar.xz
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ rm -rf /home/jarvis/kernel/kernel-6.9.9-SPECPARTS
+ /usr/bin/mkdir -p /home/jarvis/kernel/kernel-6.9.9-SPECPARTS
+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
+ mv linux-6.9.9 linux-6.9.9-200.fc40.x86_64
+ cd linux-6.9.9-200.fc40.x86_64
+ cp -a /home/jarvis/kernel/Makefile.rhelver .
kernel.spec:1796: Start of patch applications
+ ApplyOptionalPatch patch-6.9-redhat.patch
+ local patch=patch-6.9-redhat.patch
+ shift
kernel.spec:1779: ApplyOptionalPatch:
+ '[' '!' -f /home/jarvis/kernel/patch-6.9-redhat.patch ']'
++ wc -l /home/jarvis/kernel/patch-6.9-redhat.patch
++ awk '{print $1}'
+ local C=1775
+ '[' 1775 -gt 9 ']'
+ ApplyPatch patch-6.9-redhat.patch
+ local patch=patch-6.9-redhat.patch
+ shift
+ '[' '!' -f /home/jarvis/kernel/patch-6.9-redhat.patch ']'
+ case "$patch" in
+ git --work-tree=. apply
+ ApplyOptionalPatch 0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch
+ local patch=0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch
+ shift
kernel.spec:1779: ApplyOptionalPatch:
+ '[' '!' -f /home/jarvis/kernel/0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch ']'
++ wc -l /home/jarvis/kernel/0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch
++ awk '{print $1}'
+ local C=30
+ '[' 30 -gt 9 ']'
+ ApplyPatch 0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch
+ local patch=0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch
+ shift
+ '[' '!' -f /home/jarvis/kernel/0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch ']'
Patch9999: 0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch
+ case "$patch" in
+ git --work-tree=. apply
+ ApplyOptionalPatch 0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch
+ local patch=0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch
+ shift
kernel.spec:1779: ApplyOptionalPatch:
+ '[' '!' -f /home/jarvis/kernel/0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch ']'
++ wc -l /home/jarvis/kernel/0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch
++ awk '{print $1}'
+ local C=128
+ '[' 128 -gt 9 ']'
+ ApplyPatch 0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch
+ local patch=0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch
+ shift
+ '[' '!' -f /home/jarvis/kernel/0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch ']'
Patch10000: 0002-drm-edid-parse-DRM-VESA-dsc-bpp-target.patch
+ case "$patch" in
+ git --work-tree=. apply
error: patch failed: drivers/gpu/drm/drm_edid.c:6376
error: drivers/gpu/drm/drm_edid.c: patch does not apply
error: patch failed: include/drm/drm_connector.h:721
error: include/drm/drm_connector.h: patch does not apply
error: patch failed: include/drm/drm_displayid.h:131
error: include/drm/drm_displayid.h: patch does not apply
error: Bad exit status from /var/tmp/rpm-tmp.raxI6p (%prep)

RPM build errors:
    Bad exit status from /var/tmp/rpm-tmp.raxI6p (%prep)

Commenting out patch 0002-[...] allows me to see that patch 0003 would also fail to apply.

[...]
Patch9999: 0001-drm-edid-Add-Vive-Cosmos-Vive-Pro-2-to-non-desktop-l.patch
+ case "$patch" in
+ git --work-tree=. apply
+ ApplyOptionalPatch 0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch
+ local patch=0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch
+ shift
kernel.spec:1779: ApplyOptionalPatch:
+ '[' '!' -f /home/jarvis/kernel/0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch ']'
++ wc -l /home/jarvis/kernel/0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch
++ awk '{print $1}'
+ local C=59
+ '[' 59 -gt 9 ']'
+ ApplyPatch 0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch
+ local patch=0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch
+ shift
+ '[' '!' -f /home/jarvis/kernel/0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch ']'
Patch10001: 0003-drm-amd-use-fixed-dsc-bits-per-pixel-from-edid.patch
+ case "$patch" in
+ git --work-tree=. apply
error: patch failed: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c:87
error: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c: patch does not apply
error: Bad exit status from /var/tmp/rpm-tmp.QxaViC (%prep)

RPM build errors:
    Bad exit status from /var/tmp/rpm-tmp.QxaViC (%prep)

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions