# git rev-parse -q --verify 5f58da2befa58edf3a70b91ed87ed9bf77f1e70e^{commit} 5f58da2befa58edf3a70b91ed87ed9bf77f1e70e already have revision, skipping fetch # git checkout -q -f -B kisskb 5f58da2befa58edf3a70b91ed87ed9bf77f1e70e # git clean -qxdf # < git log -1 # commit 5f58da2befa58edf3a70b91ed87ed9bf77f1e70e # Merge: a51e3ac43ddb a687efed194b # Author: Linus Torvalds # Date: Thu Dec 2 14:38:54 2021 -0800 # # Merge tag 'drm-fixes-2021-12-03-1' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "Bit of an uptick in patch count this week, though it's all relatively # small overall. # # I suspect msm has been queuing up a few fixes to skew it here. # Otherwise amdgpu has a scattered bunch of small fixes, and then some # vc4, i915. # # virtio-gpu changes an rc1 introduced uAPI mistake, and makes it # operate more like other drivers. This should be fine as no userspace # relies on the behaviour yet. # # Summary: # # dma-buf: # - memory leak fix # # msm: # - kasan found memory overwrite # - mmap flags # - fencing error bug # - ioctl NULL ptr # - uninit var # - devfreqless devices fix # - dsi lanes fix # - dp: avoid unpowered aux xfers # # amdgpu: # - IP discovery based enumeration fixes # - vkms fixes # - DSC fixes for DP MST # - Audio fix for hotplug with tiled displays # - Misc display fixes # - DP tunneling fix # - DP fix # - Aldebaran fix # # amdkfd: # - Locking fix # - Static checker fix # - Fix double free # # i915: # - backlight regression # - Intel HDR backlight detection fix # - revert TGL workaround that caused hangs # # virtio-gpu: # - switch back to drm_poll # # vc4: # - memory leak # - error check fix # - HVS modesetting fixes" # # * tag 'drm-fixes-2021-12-03-1' of git://anongit.freedesktop.org/drm/drm: (41 commits) # Revert "drm/i915: Implement Wa_1508744258" # drm/amdkfd: process_info lock not needed for svm # drm/amdgpu: adjust the kfd reset sequence in reset sriov function # drm/amd/display: add connector type check for CRC source set # drm/amdkfd: fix double free mem structure # drm/amdkfd: set "r = 0" explicitly before goto # drm/amd/display: Add work around for tunneled MST. # drm/amd/display: Fix for the no Audio bug with Tiled Displays # drm/amd/display: Clear DPCD lane settings after repeater training # drm/amd/display: Allow DSC on supported MST branch devices # drm/amdgpu: Don't halt RLC on GFX suspend # drm/amdgpu: fix the missed handling for SDMA2 and SDMA3 # drm/amdgpu: check atomic flag to differeniate with legacy path # drm/amdgpu: cancel the correct hrtimer on exit # drm/amdgpu/sriov/vcn: add new vcn ip revision check case for SIENNA_CICHLID # drm/i915/dp: Perform 30ms delay after source OUI write # dma-buf: system_heap: Use 'for_each_sgtable_sg' in pages free flow # drm/i915: Add support for panels with VESA backlights with PWM enable/disable # drm/vc4: kms: Fix previous HVS commit wait # drm/vc4: kms: Don't duplicate pending commit # ... # < /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 5f58da2befa58edf3a70b91ed87ed9bf77f1e70e # < make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # 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 8 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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 8 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:11887:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11890:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11892:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11894:warning: override: reassigning to symbol UML_NET_SLIP .config:11897:warning: override: reassigning to symbol UML_NET_MCAST .config:11899:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 8 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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[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 8 ARCH=um O=/kisskb/build/linus_um-allmodconfig_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-allmodconfig_um-x86_64 # Build took: 0:07:32.955322