# git rev-parse -q --verify 56d33754481fe0dc7436dc4ee4fbd44b3039361d^{commit} 56d33754481fe0dc7436dc4ee4fbd44b3039361d already have revision, skipping fetch # git checkout -q -f -B kisskb 56d33754481fe0dc7436dc4ee4fbd44b3039361d # git clean -qxdf # < git log -1 # commit 56d33754481fe0dc7436dc4ee4fbd44b3039361d # Merge: 464fddbba1df d9bd054177fb # Author: Linus Torvalds # Date: Tue Nov 2 16:47:49 2021 -0700 # # Merge tag 'drm-next-2021-11-03' of git://anongit.freedesktop.org/drm/drm # # Pull drm updates from Dave Airlie: # "Summary below. i915 starts to add support for DG2 GPUs, enables DG1 # and ADL-S support by default, lots of work to enable DisplayPort 2.0 # across drivers. Lots of documentation updates and fixes across the # board. # # core: # - improve dma_fence, lease and resv documentation # - shmem-helpers: allocate WC pages on x86, use vmf_insert_pin # - sched fixes/improvements # - allow empty drm leases # - add dma resv iterator # - add more DP 2.0 headers # - DP MST helper improvements for DP2.0 # # dma-buf: # - avoid warnings, remove fence trace macros # # bridge: # - new helper to get rid of panels # - probe improvements for it66121 # - enable DSI EOTP for anx7625 # # fbdev: # - efifb: release runtime PM on destroy # # ttm: # - kerneldoc switch # - helper to clear all DMA mappings # - pool shrinker optimizaton # - remove ttm_tt_destroy_common # - update ttm_move_memcpy for async use # # panel: # - add new panel-edp driver # # amdgpu: # - Initial DP 2.0 support # - Initial USB4 DP tunnelling support # - Aldebaran MCE support # - Modifier support for DCC image stores for GFX 10.3 # - Display rework for better FP code handling # - Yellow Carp/Cyan Skillfish updates # - Cyan Skillfish display support # - convert vega/navi to IP discovery asic enumeration # - validate IP discovery table # - RAS improvements # - Lots of fixes # # i915: # - DG1 PCI IDs + LMEM discovery/placement # - DG1 GuC submission by default # - ADL-S PCI IDs updated + enabled by default # - ADL-P (XE_LPD) fixed and updates # - DG2 display fixes # - PXP protected object support for Gen12 integrated # - expose multi-LRC submission interface for GuC # - export logical engine instance to user # - Disable engine bonding on Gen12+ # - PSR cleanup # - PSR2 selective fetch by default # - DP 2.0 prep work # - VESA vendor block + MSO use of it # - FBC refactor # - try again to fix fast-narrow vs slow-wide eDP training # - use THP when IOMMU enabled # - LMEM backup/restore for suspend/resume # - locking simplification # - GuC major reworking # - async flip VT-D workaround changes # - DP link training improvements # - misc display refactorings # # bochs: # - new PCI ID # # rcar-du: # - Non-contiguious buffer import support for rcar-du # - r8a779a0 support prep # # omapdrm: # - COMPILE_TEST fixes # # sti: # - COMPILE_TEST fixes # # msm: # - fence ordering improvements # - eDP support in DP sub-driver # - dpu irq handling cleanup # - CRC support for making igt happy # - NO_CONNECTOR bridge support # - dsi: 14nm phy support for msm8953 # - mdp5: msm8x53, sdm450, sdm632 support # # stm: # - layer alpha + zpo support # # v3d: # - fix Vulkan CTS failure # - support multiple sync objects # # gud: # - add R8/RGB332/RGB888 pixel formats # # vc4: # - convert to new bridge helpers # # vgem: # - use shmem helpers # # virtio: # - support mapping exported vram # # zte: # - remove obsolete driver # # rockchip: # - use bridge attach no connector for LVDS/RGB" # # * tag 'drm-next-2021-11-03' of git://anongit.freedesktop.org/drm/drm: (1259 commits) # drm/amdgpu/gmc6: fix DMA mask from 44 to 40 bits # drm/amd/display: MST support for DPIA # drm/amdgpu: Fix even more out of bound writes from debugfs # drm/amdgpu/discovery: add SDMA IP instance info for soc15 parts # drm/amdgpu/discovery: add UVD/VCN IP instance info for soc15 parts # drm/amdgpu/UAPI: rearrange header to better align related items # drm/amd/display: Enable dpia in dmub only for DCN31 B0 # drm/amd/display: Fix USB4 hot plug crash issue # drm/amd/display: Fix deadlock when falling back to v2 from v3 # drm/amd/display: Fallback to clocks which meet requested voltage on DCN31 # drm/amd/display: move FPU associated DCN301 code to DML folder # drm/amd/display: fix link training regression for 1 or 2 lane # drm/amd/display: add two lane settings training options # drm/amd/display: decouple hw_lane_settings from dpcd_lane_settings # drm/amd/display: implement decide lane settings # drm/amd/display: adopt DP2.0 LT SCR revision 8 # drm/amd/display: FEC configuration for dpia links in MST mode # drm/amd/display: FEC configuration for dpia links # drm/amd/display: Add workaround flag for EDID read on certain docks # drm/amd/display: Set phy_mux_sel bit in dmub scratch register # ... # < /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 56d33754481fe0dc7436dc4ee4fbd44b3039361d # < make -s -j 32 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 32 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 32 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:12050:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12053:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:12055:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12057:warning: override: reassigning to symbol UML_NET_SLIP .config:12060:warning: override: reassigning to symbol UML_NET_MCAST .config:12062:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 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:277: drivers/video/fbdev/riva/fbdev.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video/fbdev/riva] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video/fbdev] Error 2 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/pci/controller/vmd.c:117:21: error: field 'sysdata' has incomplete type struct pci_sysdata sysdata; ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_compose_msi_msg': /kisskb/src/drivers/pci/controller/vmd.c:151:20: error: 'X86_MSI_BASE_ADDRESS_HIGH' undeclared (first use in this function) msg->address_hi = X86_MSI_BASE_ADDRESS_HIGH; ^ /kisskb/src/drivers/pci/controller/vmd.c:151:20: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/pci/controller/vmd.c:152:19: error: 'arch_msi_msg_addr_lo_t {aka struct arch_msi_msg_addr_lo}' has no member named 'base_address' msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; ^ /kisskb/src/drivers/pci/controller/vmd.c:152:35: error: 'X86_MSI_BASE_ADDRESS_LOW' undeclared (first use in this function) msg->arch_addr_lo.base_address = X86_MSI_BASE_ADDRESS_LOW; ^ /kisskb/src/drivers/pci/controller/vmd.c:153:19: error: 'arch_msi_msg_addr_lo_t {aka struct arch_msi_msg_addr_lo}' has no member named 'destid_0_7' msg->arch_addr_lo.destid_0_7 = index_from_irqs(vmd, irq); ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_enable_domain': /kisskb/src/drivers/pci/controller/vmd.c:751:4: error: dereferencing pointer to incomplete type 'struct pci_sysdata' sd->vmd_dev = vmd->dev; ^ /kisskb/src/drivers/pci/controller/vmd.c: In function 'vmd_from_bus': /kisskb/src/drivers/pci/controller/vmd.c:128:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:277: drivers/pci/controller/vmd.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/pci/controller] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/pci] Error 2 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:540: drivers/video] Error 2 make[1]: *** [/kisskb/src/Makefile:1872: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 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:02:47.043292