# git rev-parse -q --verify a4849f6000e29235a2707f22e39da6b897bb9543^{commit} a4849f6000e29235a2707f22e39da6b897bb9543 already have revision, skipping fetch # git checkout -q -f -B kisskb a4849f6000e29235a2707f22e39da6b897bb9543 # git clean -qxdf # < git log -1 # commit a4849f6000e29235a2707f22e39da6b897bb9543 # Merge: 8ced7ca35703 fc026c8b9268 # Author: Linus Torvalds # Date: Thu Nov 25 18:21:20 2021 -0800 # # Merge tag 'drm-fixes-2021-11-26' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "No idea if turkey comes before pull request processing, but here's the # regular week's fixes. A bunch for amdgpu, nouveau adds support for a # new GPU (like a PCI ID addition), and a scattering of fixes across # i915/hyperv/aspeed/vc4. # # Specifics: # # amdgpu: # - SRIOV fixes # - dma-buf double free fix # - Display fixes for GPU resets # - Fix DSC powergating regression # - GPU TSC fixes # - Interrupt handler overflow fixes # - Endian fix in IP discovery table handling # - Aldebaran ASPM fix # - Fix overclocking regression on older asics # - Backlight/ACPI fix # # amdkfd: # - SVM fixes # - VMA removal race fix # # hyperv: # - removal fix # # aspeed: # - vga_pw sysfs file fix # # vc4: # - error checking fix # # nouveau: # - support GA106 # - fix a few error checks # # i915: # - fix wakeref handling around PXP suspend" # # * tag 'drm-fixes-2021-11-26' of git://anongit.freedesktop.org/drm/drm: (25 commits) # drm/amd/display: update bios scratch when setting backlight # drm/amdgpu/pm: fix powerplay OD interface # drm/amdgpu: Skip ASPM programming on aldebaran # drm/amdgpu: fix byteorder error in amdgpu discovery # drm/amdgpu: enable Navi retry fault wptr overflow # drm/amdgpu: enable Navi 48-bit IH timestamp counter # drm/amdkfd: simplify drain retry fault # drm/amdkfd: handle VMA remove race # drm/amdkfd: process exit and retry fault race # drm/amdgpu: IH process reset count when restart # drm/amdgpu/gfx9: switch to golden tsc registers for renoir+ # drm/amdgpu/gfx10: add wraparound gpu counter check for APUs as well # drm/amdgpu: move kfd post_reset out of reset_sriov function # drm/amd/display: Fixed DSC would not PG after removing DSC stream # drm/amd/display: Reset link encoder assignments for GPU reset # drm/amd/display: Set plane update flags for all planes in reset # drm/amd/display: Fix DPIA outbox timeout after GPU reset # drm/amdgpu: Fix double free of dmabuf # drm/amdgpu: Fix MMIO HDP flush on SRIOV # drm/i915/gt: Hold RPM wakelock during PXP suspend # ... # < /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 a4849f6000e29235a2707f22e39da6b897bb9543 # < 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:11886:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11889:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11891:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11893:warning: override: reassigning to symbol UML_NET_SLIP .config:11896:warning: override: reassigning to symbol UML_NET_MCAST .config:11898: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[5]: *** Waiting for unfinished jobs.... 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 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:08:25.132834