# git rev-parse -q --verify 486291a0e6246364936df1ecd64c90affef4b9c5^{commit} 486291a0e6246364936df1ecd64c90affef4b9c5 already have revision, skipping fetch # git checkout -q -f -B kisskb 486291a0e6246364936df1ecd64c90affef4b9c5 # git clean -qxdf # < git log -1 # commit 486291a0e6246364936df1ecd64c90affef4b9c5 # Merge: 1ab5c8a338c4 b01f596ab1dd # Author: Linus Torvalds # Date: Fri Mar 29 15:51:15 2024 -0700 # # Merge tag 'drm-fixes-2024-03-30' of https://gitlab.freedesktop.org/drm/kernel # # Pull drm fixes from Dave Airlie: # "Regular fixes for rc2, quite a few i915/amdgpu as usual, some xe, and # then mostly scattered around. rc3 might be quieter with the holidays # but we shall see. # # bridge: # - select DRM_KMS_HELPER # # dma-buf: # - fix NULL-pointer deref # # dp: # - fix div-by-zero in DP MST unplug code # # fbdev: # - select FB_IOMEM_FOPS for SBus # # sched: # - fix NULL-pointer deref # # xe: # - Fix build on mips # - Fix wrong bound checks # - Fix use of msec rather than jiffies # - Remove dead code # # amdgpu: # - SMU 14.0.1 updates # - DCN 3.5.x updates # - VPE fix # - eDP panel flickering fix # - Suspend fix # - PSR fix # - DCN 3.0+ fix # - VCN 4.0.6 updates # - debugfs fix # # amdkfd: # - DMA-Buf fix # - GFX 9.4.2 TLB flush fix # - CP interrupt fix # # i915: # - Fix for BUG_ON/BUILD_BUG_ON IN I915_memcpy.c # - Update a MTL workaround # - Fix locking inversion in hwmon's sysfs # - Remove a bogus error message around PXP # - Fix UAF on VMA # - Reset queue_priority_hint on parking # - Display Fixes: # - Remove duplicated audio enable/disable on SDVO and DP # - Disable AuxCCS for Xe driver # - Revert init order of MIPI DSI # - DRRS debugfs fix with an extra refactor patch # - VRR related fixes # - Fix a JSL eDP corruption # - Fix the cursor physical dma address # - BIOS VBT related fix # # nouveau: # - dmem: handle kcalloc() allocation failures # # qxl: # - remove unused variables # # rockchip: # - vop2: remove support for AR30 and AB30 formats # # vmwgfx: # - debugfs: create ttm_resource_manager entry only if needed" # # * tag 'drm-fixes-2024-03-30' of https://gitlab.freedesktop.org/drm/kernel: (55 commits) # drm/i915/bios: Tolerate devdata==NULL in intel_bios_encoder_supports_dp_dual_mode() # drm/i915: Pre-populate the cursor physical dma address # drm/i915/gt: Reset queue_priority_hint on parking # drm/i915/vma: Fix UAF on destroy against retire race # drm/i915: Do not print 'pxp init failed with 0' when it succeed # drm/i915: Do not match JSL in ehl_combo_pll_div_frac_wa_needed() # drm/i915/hwmon: Fix locking inversion in sysfs getter # drm/i915/dsb: Fix DSB vblank waits when using VRR # drm/i915/vrr: Generate VRR "safe window" for DSB # drm/i915/display/debugfs: Fix duplicate checks in i915_drrs_status # drm/i915/drrs: Refactor CPU transcoder DRRS check # drm/i915/mtl: Update workaround 14018575942 # drm/i915/dsi: Go back to the previous INIT_OTP/DISPLAY_ON order, mostly # drm/i915/display: Disable AuxCCS framebuffers if built for Xe # drm/i915: Stop doing double audio enable/disable on SDVO and g4x+ DP # drm/i915: Add includes for BUG_ON/BUILD_BUG_ON in i915_memcpy.c # drm/qxl: remove unused variable from `qxl_process_single_command()` # drm/qxl: remove unused `count` variable from `qxl_surface_id_alloc()` # drm/i915: add bug.h include to i915_memcpy.c # drm/vmwgfx: Create debugfs ttm_resource_manager entry only if needed # ... # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 486291a0e6246364936df1ecd64c90affef4b9c5 # make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/math-emu/math.c:492:5: error: no previous prototype for 'do_fpu_inst' [-Werror=missing-prototypes] 492 | int do_fpu_inst(unsigned short inst, struct pt_regs *regs) | ^~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/math-emu/math.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/math-emu] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sh/kernel/cpu/init.c:99:29: error: no previous prototype for 'l2_cache_init' [-Werror=missing-prototypes] 99 | void __attribute__ ((weak)) l2_cache_init(void) | ^~~~~~~~~~~~~ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/kernel/cpu/init.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/kernel/cpu] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/kernel] Error 2 /kisskb/src/arch/sh/mm/cache-sh2.c:85:13: error: no previous prototype for 'sh2_cache_init' [-Werror=missing-prototypes] 85 | void __init sh2_cache_init(void) | ^~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:244: arch/sh/mm/cache-sh2.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh/mm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: arch/sh] Error 2 make[3]: *** Waiting for unfinished jobs.... {standard input}: Assembler messages: {standard input}: Warning: end of file not at end of a line; newline inserted {standard input}:1099: Error: missing operand {standard input}:1099: Error: missing operand {standard input}:1099: Error: invalid operands for opcode {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive sh4-linux-gcc: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source (by using -freport-bug). See for instructions. make[6]: *** [/kisskb/src/scripts/Makefile.build:244: drivers/net/pcs/pcs-xpcs.o] Error 4 make[5]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/net/pcs] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:485: drivers/net] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:485: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1919: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 32 ARCH=sh O=/kisskb/build/linus_allmodconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_sh4-gcc13 # Build took: 0:09:11.938006