# git rev-parse -q --verify 477f70cd2a67904e04c2c2b9bd0fa2e95222f2f6^{commit} 477f70cd2a67904e04c2c2b9bd0fa2e95222f2f6 already have revision, skipping fetch # git checkout -q -f -B kisskb 477f70cd2a67904e04c2c2b9bd0fa2e95222f2f6 # git clean -qxdf # < git log -1 # commit 477f70cd2a67904e04c2c2b9bd0fa2e95222f2f6 # Merge: 835d31d319d9 8f0284f190e6 # Author: Linus Torvalds # Date: Wed Sep 1 11:26:46 2021 -0700 # # Merge tag 'drm-next-2021-08-31-1' of git://anongit.freedesktop.org/drm/drm # # Pull drm updates from Dave Airlie: # "Highlights: # # - i915 has seen a lot of refactoring and uAPI cleanups due to a # change in the upstream direction going forward # # This has all been audited with known userspace, but there may be # some pitfalls that were missed. # # - i915 now uses common TTM to enable discrete memory on DG1/2 GPUs # # - i915 enables Jasper and Elkhart Lake by default and has preliminary # XeHP/DG2 support # # - amdgpu adds support for Cyan Skillfish # # - lots of implicit fencing rules documented and fixed up in drivers # # - msm now uses the core scheduler # # - the irq midlayer has been removed for non-legacy drivers # # - the sysfb code now works on more than x86. # # Otherwise the usual smattering of stuff everywhere, panels, bridges, # refactorings. # # Detailed summary: # # core: # - extract i915 eDP backlight into core # - DP aux bus support # - drm_device.irq_enabled removed # - port drivers to native irq interfaces # - export gem shadow plane handling for vgem # - print proper driver name in framebuffer registration # - driver fixes for implicit fencing rules # - ARM fixed rate compression modifier added # - updated fb damage handling # - rmfb ioctl logging/docs # - drop drm_gem_object_put_locked # - define DRM_FORMAT_MAX_PLANES # - add gem fb vmap/vunmap helpers # - add lockdep_assert(once) helpers # - mark drm irq midlayer as legacy # - use offset adjusted bo mapping conversion # # vgaarb: # - cleanups # # fbdev: # - extend efifb handling to all arches # - div by 0 fixes for multiple drivers # # udmabuf: # - add hugepage mapping support # # dma-buf: # - non-dynamic exporter fixups # - document implicit fencing rules # # amdgpu: # - Initial Cyan Skillfish support # - switch virtual DCE over to vkms based atomic # - VCN/JPEG power down fixes # - NAVI PCIE link handling fixes # - AMD HDMI freesync fixes # - Yellow Carp + Beige Goby fixes # - Clockgating/S0ix/SMU/EEPROM fixes # - embed hw fence in job # - rework dma-resv handling # - ensure eviction to system ram # # amdkfd: # - uapi: SVM address range query added # - sysfs leak fix # - GPUVM TLB optimizations # - vmfault/migration counters # # i915: # - Enable JSL and EHL by default # - preliminary XeHP/DG2 support # - remove all CNL support (never shipped) # - move to TTM for discrete memory support # - allow mixed object mmap handling # - GEM uAPI spring cleaning # - add I915_MMAP_OBJECT_FIXED # - reinstate ADL-P mmap ioctls # - drop a bunch of unused by userspace features # - disable and remove GPU relocations # - revert some i915 misfeatures # - major refactoring of GuC for Gen11+ # - execbuffer object locking separate step # - reject caching/set-domain on discrete # - Enable pipe DMC loading on XE-LPD and ADL-P # - add PSF GV point support # - Refactor and fix DDI buffer translations # - Clean up FBC CFB allocation code # - Finish INTEL_GEN() and friends macro conversions # # nouveau: # - add eDP backlight support # - implicit fence fix # # msm: # - a680/7c3 support # - drm/scheduler conversion # # panfrost: # - rework GPU reset # # virtio: # - fix fencing for planes # # ast: # - add detect support # # bochs: # - move to tiny GPU driver # # vc4: # - use hotplug irqs # - HDMI codec support # # vmwgfx: # - use internal vmware device headers # # ingenic: # - demidlayering irq # # rcar-du: # - shutdown fixes # - convert to bridge connector helpers # # zynqmp-dsub: # - misc fixes # # mgag200: # - convert PLL handling to atomic # # mediatek: # - MT8133 AAL support # - gem mmap object support # - MT8167 support # # etnaviv: # - NXP Layerscape LS1028A SoC support # - GEM mmap cleanups # # tegra: # - new user API # # exynos: # - missing unlock fix # - build warning fix # - use refcount_t" # # * tag 'drm-next-2021-08-31-1' of git://anongit.freedesktop.org/drm/drm: (1318 commits) # drm/amd/display: Move AllowDRAMSelfRefreshOrDRAMClockChangeInVblank to bounding box # drm/amd/display: Remove duplicate dml init # drm/amd/display: Update bounding box states (v2) # drm/amd/display: Update number of DCN3 clock states # drm/amdgpu: disable GFX CGCG in aldebaran # drm/amdgpu: Clear RAS interrupt status on aldebaran # drm/amdgpu: Add support for RAS XGMI err query # drm/amdkfd: Account for SH/SE count when setting up cu masks. # drm/amdgpu: rename amdgpu_bo_get_preferred_pin_domain # drm/amdgpu: drop redundant cancel_delayed_work_sync call # drm/amdgpu: add missing cleanups for more ASICs on UVD/VCE suspend # drm/amdgpu: add missing cleanups for Polaris12 UVD/VCE on suspend # drm/amdkfd: map SVM range with correct access permission # drm/amdkfd: check access permisson to restore retry fault # drm/amdgpu: Update RAS XGMI Error Query # drm/amdgpu: Add driver infrastructure for MCA RAS # drm/amd/display: Add Logging for HDMI color depth information # drm/amd/amdgpu: consolidate PSP TA init shared buf functions # drm/amd/amdgpu: add name field back to ras_common_if # drm/amdgpu: Fix build with missing pm_suspend_target_state module export # ... # < /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 477f70cd2a67904e04c2c2b9bd0fa2e95222f2f6 # < make -s -j 24 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 24 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 24 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:11645:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11648:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11650:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11652:warning: override: reassigning to symbol UML_NET_SLIP .config:11655:warning: override: reassigning to symbol UML_NET_MCAST .config:11657:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 24 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/kernel/trace/trace_osnoise.c: In function 'start_kthread': /kisskb/src/kernel/trace/trace_osnoise.c:1515:8: warning: 'main' is usually a function [-Wmain] void *main = osnoise_main; ^ /kisskb/src/drivers/pci/controller/vmd.c:116: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:150: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:150:20: note: each undeclared identifier is reported only once for each function it appears in /kisskb/src/drivers/pci/controller/vmd.c:151: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:151: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:152: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:700: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:127:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: some warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/pci/controller/vmd.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/pci/controller] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/pci] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2062:11: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-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:29, 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: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-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:29, 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/nvidia/nvidia.c: In function 'nvidiafb_probe': /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:1414:10: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-qualifiers] iounmap(par->REGS); ^ 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:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:19: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile u32 * {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/nvidia/nvidia.c: In function 'nvidiafb_remove': /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:1439:10: warning: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Wdiscarded-qualifiers] iounmap(par->REGS); ^ 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:29, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/nvidia/nvidia.c:19: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile u32 * {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); ^ make[1]: *** [/kisskb/src/Makefile:1851: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:220: __sub-make] Error 2 Command 'make -s -j 24 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:05:50.590077