# git rev-parse -q --verify 4f3d93c6eaff6b84e43b63e0d7a119c5920e1020^{commit} 4f3d93c6eaff6b84e43b63e0d7a119c5920e1020 already have revision, skipping fetch # git checkout -q -f -B kisskb 4f3d93c6eaff6b84e43b63e0d7a119c5920e1020 # git clean -qxdf # < git log -1 # commit 4f3d93c6eaff6b84e43b63e0d7a119c5920e1020 # Merge: 012e332286e2 ce9b333c73a5 # Author: Linus Torvalds # Date: Thu Dec 30 18:25:43 2021 -0800 # # Merge tag 'drm-fixes-2021-12-31' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "This is a bit bigger than I'd like, however it has two weeks of amdgpu # fixes in it, since they missed last week, which was very small. # # The nouveau regression is probably the biggest fix in here, and it # needs to go into 5.15 as well, two i915 fixes, and then a scattering # of amdgpu fixes. The biggest fix in there is for a fencing NULL # pointer dereference, the rest are pretty minor. # # For the misc team, I've pulled the two misc fixes manually since I'm # not sure what is happening at this time of year! # # The amdgpu maintainers have the outstanding runpm regression to fix # still, they are just working through the last bits of it now. # # Summary: # # nouveau: # - fencing regression fix # # i915: # - Fix possible uninitialized variable # - Fix composite fence seqno icrement on each fence creation # # amdgpu: # - Fencing fix # - XGMI fix # - VCN regression fix # - IP discovery regression fixes # - Fix runpm documentation # - Suspend/resume fixes # - Yellow Carp display fixes # - MCLK power management fix # - dma-buf fix" # # * tag 'drm-fixes-2021-12-31' of git://anongit.freedesktop.org/drm/drm: # drm/amd/display: Changed pipe split policy to allow for multi-display pipe split # drm/amd/display: Fix USB4 null pointer dereference in update_psp_stream_config # drm/amd/display: Set optimize_pwr_state for DCN31 # drm/amd/display: Send s0i2_rdy in stream_count == 0 optimization # drm/amd/display: Added power down for DCN10 # drm/amd/display: fix B0 TMDS deepcolor no dislay issue # drm/amdgpu: no DC support for headless chips # drm/amdgpu: put SMU into proper state on runpm suspending for BOCO capable platform # drm/amdgpu: always reset the asic in suspend (v2) # drm/amd/pm: skip setting gfx cgpg in the s0ix suspend-resume # drm/i915: Increment composite fence seqno # drm/i915: Fix possible uninitialized variable in parallel extension # drm/amdgpu: fix runpm documentation # drm/nouveau: wait for the exclusive fence after the shared ones v2 # drm/amdgpu: add support for IP discovery gc_info table v2 # drm/amdgpu: When the VCN(1.0) block is suspended, powergating is explicitly enabled # drm/amd/pm: Fix xgmi link control on aldebaran # drm/amdgpu: introduce new amdgpu_fence object to indicate the job embedded fence # drm/amdgpu: fix dropped backing store handling in amdgpu_dma_buf_move_notify # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 4f3d93c6eaff6b84e43b63e0d7a119c5920e1020 # < make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allyesconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12112:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12115:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12117:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12119:warning: override: reassigning to symbol UML_NET_SLIP .config:12122:warning: override: reassigning to symbol UML_NET_MCAST .config:12124:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/Makefile:44: FORCE prerequisite is missing /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2062:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(default_par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:28, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_remove': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2095:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:28, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:287: drivers/video/fbdev/riva/fbdev.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/video/fbdev/riva] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/video/fbdev] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/video] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1846: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 24 ARCH=um O=/kisskb/build/linus_um-allyesconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allyesconfig_um-x86_64 # Build took: 0:06:39.473865