# git rev-parse -q --verify 168174d78157bba1315d5f8e1c66548b92c84ae9^{commit} 168174d78157bba1315d5f8e1c66548b92c84ae9 already have revision, skipping fetch # git checkout -q -f -B kisskb 168174d78157bba1315d5f8e1c66548b92c84ae9 # git clean -qxdf # < git log -1 # commit 168174d78157bba1315d5f8e1c66548b92c84ae9 # Merge: 2047b0b27508 987940f05735 # Author: Linus Torvalds # Date: Fri Jan 26 13:52:18 2024 -0800 # # Merge tag 'drm-fixes-2024-01-27' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "Lots going on for rc2, ivpu has a bunch of stabilisation and debugging # work, then amdgpu and xe are the main fixes. i915, exynos have a few, # then some misc panel and bridge fixes. # # Worth mentioning are three regressions. One of the nouveau fixes in # 6.7 for a serious deadlock had side effects, so I guess we will bring # back the deadlock until I can figure out what should be done properly. # There was a scheduler regression vs amdgpu which was reported in a few # places and is now fixed. There was an i915 vs simpledrm problem # resulting in black screens, that is reverted also. # # I'll be working on a proper nouveau fix, it kinda looks like one of # those cases where someone tried to use an atomic where they should # have probably used a lock, but I'll see. # # fb: # - fix simpledrm/i915 regression by reverting change # # scheduler: # - fix regression affecting amdgpu users due to sched draining # # nouveau: # - revert 6.7 deadlock fix as it has side effects # # dp: # - fix documentation warning # # ttm: # - fix dummy page read on some platforms # # bridge: # - anx7625 suspend fix # - sii902x: fix probing and audio registration # - parade-ps8640: fix suspend of bridge, aux fixes # - samsung-dsim: avoid using FORCE_STOP_STATE # # panel: # - simple add missing bus flags # - fix samsung-s6d7aa0 flags # # amdgpu: # - AC/DC power supply tracking fix # - Don't show invalid vram vendor data # - SMU 13.0.x fixes # - GART fix for umr on systems without VRAM # - GFX 10/11 UNORD_DISPATCH fixes # - IPS display fixes (required for S0ix on some platforms) # - Misc fixes # # i915: # - DSI sequence revert to fix GitLab #10071 and DP test-pattern fix # - Drop -Wstringop-overflow (broken on GCC11) # # ivpu: # - fix recovery/reset support # - improve submit ioctl stability # - fix dev open/close races on unbind # - PLL disable reset fix # - deprecate context priority param # - improve debug buffer logging # - disable buffer sharing across VPU contexts # - free buffer sgt on unbind # - fix missing lock around shmem vmap # - add better boot diagnostics # - add more debug prints around mapping # - dump MMU events in case of timeout # # v3d: # - NULL ptr dereference fix # # exynos: # - fix stack usage # - fix incorrect type # - fix dt typo # - fix gsc runtime resume # # xe: # - Make an ops struct static # - Fix an implicit 0 to NULL conversion # - A couple of 32-bit fixes # - A migration coherency fix for Lunar Lake. # - An error path vm id leak fix # - Remove PVC references in kunit tests" # # * tag 'drm-fixes-2024-01-27' of git://anongit.freedesktop.org/drm/drm: (66 commits) # Revert "nouveau: push event block/allowing out of the fence context" # drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE # drm/sched: Drain all entities in DRM sched run job worker # drm/amd/display: "Enable IPS by default" # drm/amd: Add a DC debug mask for IPS # drm/amd/display: Disable ips before dc interrupt setting # drm/amd/display: Replay + IPS + ABM in Full Screen VPB # drm/amd/display: Add IPS checks before dcn register access # drm/amd/display: Add Replay IPS register for DMUB command table # drm/amd/display: Allow IPS2 during Replay # drm/amdgpu/gfx11: set UNORD_DISPATCH in compute MQDs # drm/amdgpu/gfx10: set UNORD_DISPATCH in compute MQDs # drm/amd/amdgpu: Assign GART pages to AMD device mapping # drm/amd/pm: Fetch current power limit from FW # drm/amdgpu: Fix null pointer dereference # drm/amdgpu: Show vram vendor only if available # drm/amd/pm: update the power cap setting # drm/amdgpu: Avoid fetching vram vendor information # drm/amdgpu/pm: Fix the power source flag error # drm/amd/display: Fix uninitialized variable usage in core_link_ 'read_dpcd() & write_dpcd()' functions # ... # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 168174d78157bba1315d5f8e1c66548b92c84ae9 # make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sparc/prom/p1275.c:52:6: error: no previous prototype for 'prom_cif_init' [-Werror=missing-prototypes] 52 | void prom_cif_init(void *cif_handler, void *cif_stack) | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/prom/misc_64.c:165:5: error: no previous prototype for 'prom_get_mmu_ihandle' [-Werror=missing-prototypes] 165 | int prom_get_mmu_ihandle(void) | ^~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/prom/p1275.o] Error 1 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sparc/kernel/traps_64.c:253:6: error: no previous prototype for 'is_no_fault_exception' [-Werror=missing-prototypes] 253 | bool is_no_fault_exception(struct pt_regs *regs) | ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/traps_64.c:2035:6: error: no previous prototype for 'do_mcd_err' [-Werror=missing-prototypes] 2035 | void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) | ^~~~~~~~~~ /kisskb/src/arch/sparc/kernel/traps_64.c:2153:6: error: no previous prototype for 'sun4v_nonresum_error_user_handled' [-Werror=missing-prototypes] 2153 | bool sun4v_nonresum_error_user_handled(struct pt_regs *regs, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/vdso/vma.c:246:12: error: no previous prototype for 'init_vdso_image' [-Werror=missing-prototypes] 246 | int __init init_vdso_image(const struct vdso_image *image, | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/prom/misc_64.o] Error 1 /kisskb/src/arch/sparc/mm/init_64.c:2644:6: error: no previous prototype for 'vmemmap_free' [-Werror=missing-prototypes] 2644 | void vmemmap_free(unsigned long start, unsigned long end, | ^~~~~~~~~~~~ /kisskb/src/arch/sparc/power/hibernate.c:22:5: error: no previous prototype for 'pfn_is_nosave' [-Werror=missing-prototypes] 22 | int pfn_is_nosave(unsigned long pfn) | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/power/hibernate.c:30:6: error: no previous prototype for 'save_processor_state' [-Werror=missing-prototypes] 30 | void save_processor_state(void) | ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/power/hibernate.c:35:6: error: no previous prototype for 'restore_processor_state' [-Werror=missing-prototypes] 35 | void restore_processor_state(void) | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/vdso/vma.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/vdso] Error 2 make[4]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/power/hibernate.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/power] Error 2 make[3]: *** Waiting for unfinished jobs.... cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/kernel/traps_64.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/prom] Error 2 /kisskb/src/arch/sparc/kernel/setup_64.c:602:13: error: no previous prototype for 'alloc_irqstack_bootmem' [-Werror=missing-prototypes] 602 | void __init alloc_irqstack_bootmem(void) | ^~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/kernel/setup_64.o] Error 1 cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/mm/init_64.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/mm] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/kernel] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc] Error 2 In file included from /kisskb/src/arch/sparc/include/asm/floppy.h:5, from /kisskb/src/drivers/block/floppy.c:250: /kisskb/src/arch/sparc/include/asm/floppy_64.h:200:13: error: no previous prototype for 'sparc_floppy_irq' [-Werror=missing-prototypes] 200 | irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie) | ^~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/include/asm/floppy_64.h:437:6: error: no previous prototype for 'sun_pci_fd_dma_callback' [-Werror=missing-prototypes] 437 | void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event, void *cookie) | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: drivers/block/floppy.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/block] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/gpu/drm/xe/xe_lrc.c:24: error: "CTX_VALID" redefined [-Werror] 24 | #define CTX_VALID (1 << 0) | In file included from /kisskb/src/arch/sparc/include/asm/mmu.h:5, from /kisskb/src/include/linux/mm_types.h:23, from /kisskb/src/arch/sparc/include/asm/uaccess_64.h:11, from /kisskb/src/arch/sparc/include/asm/uaccess.h:8, from /kisskb/src/include/linux/uaccess.h:11, from /kisskb/src/include/linux/sched/task.h:13, from /kisskb/src/include/linux/sched/signal.h:9, from /kisskb/src/include/linux/rcuwait.h:6, from /kisskb/src/include/linux/irq_work.h:6, from /kisskb/src/drivers/gpu/drm/xe/xe_hw_fence_types.h:11, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc_types.h:9, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc.h:8, from /kisskb/src/drivers/gpu/drm/xe/xe_lrc.c:6: /kisskb/src/arch/sparc/include/asm/mmu_64.h:57: note: this is the location of the previous definition 57 | #define CTX_VALID(__ctx) \ | cc1: all warnings being treated as errors make[7]: *** [/kisskb/src/scripts/Makefile.build:243: drivers/gpu/drm/xe/xe_lrc.o] Error 1 make[7]: *** Waiting for unfinished jobs.... make[6]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/gpu/drm/xe] Error 2 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/gpu/drm] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/gpu] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1921: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 160 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sparc64-linux/bin/sparc64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_sparc64-gcc13 # Build took: 0:07:29.763318