# git rev-parse -q --verify e058a84bfddc42ba356a2316f2cf1141974625c9^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master warning: The last gc run reported the following. Please correct the root cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed. warning: There are too many unreachable loose objects; run 'git prune' to remove them. # git rev-parse -q --verify e058a84bfddc42ba356a2316f2cf1141974625c9^{commit} e058a84bfddc42ba356a2316f2cf1141974625c9 # git checkout -q -f -B kisskb e058a84bfddc42ba356a2316f2cf1141974625c9 # git clean -qxdf # < git log -1 # commit e058a84bfddc42ba356a2316f2cf1141974625c9 # Merge: c288d9cd7104 8a02ea42bc1d # Author: Linus Torvalds # Date: Thu Jul 1 12:53:43 2021 -0700 # # Merge tag 'drm-next-2021-07-01' of git://anongit.freedesktop.org/drm/drm # # Pull drm updates from Dave Airlie: # "Highlights: # # - AMD enables two more GPUs, with resulting header files # # - i915 has started to move to TTM for discrete GPU and enable DG1 # discrete GPU support (not by default yet) # # - new HyperV drm driver # # - vmwgfx adds arm64 support # # - TTM refactoring ongoing # # - 16bpc display support for AMD hw # # Otherwise it's just the usual insane amounts of work all over the # place in lots of drivers and the core, as mostly summarised below: # # Core: # - mark AGP ioctls as legacy # - disable force probing for non-master clients # - HDR metadata property helpers # - HDMI infoframe signal colorimetry support # - remove drm_device.pdev pointer # - remove DRM_KMS_FB_HELPER config option # - remove drm_pci_alloc/free # - drm_err_*/drm_dbg_* helpers # - use drm driver names for fbdev # - leaked DMA handle fix # - 16bpc fixed point format fourcc # - add prefetching memcpy for WC # - Documentation fixes # # aperture: # - add aperture ownership helpers # # dp: # - aux fixes # - downstream 0 port handling # - use extended base receiver capability DPCD # - Rename DP_PSR_SELECTIVE_UPDATE to better mach eDP spec # - mst: use khz as link rate during init # - VCPI fixes for StarTech hub # # ttm: # - provide tt_shrink file via debugfs # - warn about freeing pinned BOs # - fix swapping error handling # - move page alignment into BO # - cleanup ttm_agp_backend # - add ttm_sys_manager # - don't override vm_ops # - ttm_bo_mmap removed # - make ttm_resource base of all managers # - remove VM_MIXEDMAP usage # # panel: # - sysfs_emit support # - simple: runtime PM support # - simple: power up panel when reading EDID + caching # # bridge: # - MHDP8546: HDCP support + DT bindings # - MHDP8546: Register DP AUX channel with userspace # - TI SN65DSI83 + SN65DSI84: add driver # - Sil8620: Fix module dependencies # - dw-hdmi: make CEC driver loading optional # - Ti-sn65dsi86: refclk fixes, subdrivers, runtime pm # - It66121: Add driver + DT bindings # - Adv7511: Support I2S IEC958 encoding # - Anx7625: fix power-on delay # - Nwi-dsi: Modesetting fixes; Cleanups # - lt6911: add missing MODULE_DEVICE_TABLE # - cdns: fix PM reference leak # # hyperv: # - add new DRM driver for HyperV graphics # # efifb: # - non-PCI device handling fixes # # i915: # - refactor IP/device versioning # - XeLPD Display IP preperation work # - ADL-P enablement patches # - DG1 uAPI behind BROKEN # - disable mmap ioctl for discerte GPUs # - start enabling HuC loading for Gen12+ # - major GuC backend rework for new platforms # - initial TTM support for Discrete GPUs # - locking rework for TTM prep # - use correct max source link rate for eDP # - %p4cc format printing # - GLK display fixes # - VLV DSI panel power fixes # - PSR2 disabled for RKL and ADL-S # - ACPI _DSM invalid access fixed # - DMC FW path abstraction # - ADL-S PCI ID update # - uAPI headers converted to kerneldoc # - initial LMEM support for DG1 # - x86/gpu: add Jasperlake to gen11 early quirks # # amdgpu: # - Aldebaran updates + initial SR-IOV # - new GPU: Beige Goby and Yellow Carp support # - more LTTPR display work # - Vangogh updates # - SDMA 5.x GCR fixes # - PCIe ASPM support # - Renoir TMZ enablement # - initial multiple eDP panel support # - use fdinfo to track devices/process info # - pin/unpin TTM fixes # - free resource on fence usage query # - fix fence calculation # - fix hotunplug/suspend issues # - GC/MM register access macro cleanup for SR-IOV # - W=1 fixes # - ACPI ATCS/ATIF handling rework # - 16bpc fixed point format support # - Initial smartshift support # - RV/PCO power tuning fixes # - new INFO query for additional vbios info # # amdkfd: # - SR-IOV aldebaran support # - HMM SVM support # # radeon: # - SMU regression fixes # - Oland flickering fix # # vmwgfx: # - enable console with fbdev emulation # - fix cpu updates of coherent multisample surfaces # - remove reservation semaphore # - add initial SVGA3 support # - support arm64 # # msm: # - devcoredump support for display errors # - dpu/dsi: yaml bindings conversion # - mdp5: alpha/blend_mode/zpos support # - a6xx: cached coherent buffer support # - gpu iova fault improvement # - a660 support # # rockchip: # - RK3036 win1 scaling support # - RK3066/3188 missing register support # - RK3036/3066/3126/3188 alpha support # # mediatek: # - MT8167 HDMI support # - MT8183 DPI dual edge support # # tegra: # - fixed YUV support/scaling on Tegra186+ # # ast: # - use pcim_iomap # - fix DP501 EDID # # bochs: # - screen blanking support # # etnaviv: # - export more GPU ID values to userspace # - add HWDB entry for GPU on i.MX8MP # - rework linear window calcs # # exynos: # - pm runtime changes # # imx: # - Annotate dma_fence critical section # - fix PRG modifiers after drmm conversion # - Add 8 pixel alignment fix for 1366x768 # - fix YUV advertising # - add color properties # # ingenic: # - IPU planes fix # # panfrost: # - Mediatek MT8183 support + DT bindings # - export AFBC_FEATURES register to userspace # # simpledrm: # - %pr for printing resources # # nouveau: # - pin/unpin TTM fixes # # qxl: # - unpin shadow BO # # virtio: # - create dumb BOs as guest blob # # vkms: # - drmm_universal_plane_alloc # - add XRGB plane composition # - overlay support" # # * tag 'drm-next-2021-07-01' of git://anongit.freedesktop.org/drm/drm: (1570 commits) # drm/i915: Reinstate the mmap ioctl for some platforms # drm/i915/dsc: abstract helpers to get bigjoiner primary/secondary crtc # Revert "drm/msm/mdp5: provide dynamic bandwidth management" # drm/msm/mdp5: provide dynamic bandwidth management # drm/msm/mdp5: add perf blocks for holding fudge factors # drm/msm/mdp5: switch to standard zpos property # drm/msm/mdp5: add support for alpha/blend_mode properties # drm/msm/mdp5: use drm_plane_state for pixel blend mode # drm/msm/mdp5: use drm_plane_state for storing alpha value # drm/msm/mdp5: use drm atomic helpers to handle base drm plane state # drm/msm/dsi: do not enable PHYs when called for the slave DSI interface # drm/msm: Add debugfs to trigger shrinker # drm/msm/dpu: Avoid ABBA deadlock between IRQ modules # drm/msm: devcoredump iommu fault support # iommu/arm-smmu-qcom: Add stall support # drm/msm: Improve the a6xx page fault handler # iommu/arm-smmu-qcom: Add an adreno-smmu-priv callback to get pagefault info # iommu/arm-smmu: Add support for driver IOMMU fault handlers # drm/msm: export hangcheck_period in debugfs # drm/msm/a6xx: add support for Adreno 660 GPU # ... # < /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 e058a84bfddc42ba356a2316f2cf1141974625c9 # < make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- randconfig # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # < make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- help # make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- olddefconfig .config:7718:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD # make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- In file included from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/tm.h:27, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/gcc-plugin.h:31, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/plugin.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:9, from /kisskb/src/scripts/gcc-plugins/stackleak_plugin.c:30: /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/tm.h:44, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/gcc-plugin.h:31, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/plugin.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:9, from /kisskb/src/scripts/gcc-plugins/stackleak_plugin.c:30: /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ cc1plus: warning: unrecognized command line option '-Wno-format-diag' In file included from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/tm.h:27, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/gcc-plugin.h:31, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/plugin.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:9, from /kisskb/src/scripts/gcc-plugins/randomize_layout_plugin.c:19: /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/config/elfos.h:102:21: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), "%s"HOST_WIDE_INT_PRINT_UNSIGNED"\n",\ ^ /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/config/elfos.h:170:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ In file included from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/tm.h:44, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/gcc-plugin.h:31, from /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/plugin.h:23, from /kisskb/src/scripts/gcc-plugins/gcc-common.h:9, from /kisskb/src/scripts/gcc-plugins/randomize_layout_plugin.c:19: /opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/../lib/gcc/aarch64-buildroot-linux-gnu/5.4.0/plugin/include/defaults.h:126:24: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED",%u\n", \ ^ cc1plus: warning: unrecognized command line option '-Wno-format-diag' /kisskb/src/fs/ntfs/aops.c: In function 'ntfs_write_mst_block': /kisskb/src/fs/ntfs/aops.c:1311:1: warning: the frame size of 2224 bytes is larger than 2048 bytes [-Wframe-larger-than=] } ^ /kisskb/src/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function 'vmw_vram_manager_init': /kisskb/src/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:678:8: error: implicit declaration of function 'ttm_range_man_init' [-Werror=implicit-function-declaration] ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM, false, ^ /kisskb/src/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: In function 'vmw_vram_manager_fini': /kisskb/src/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c:690:2: error: implicit declaration of function 'ttm_range_man_fini' [-Werror=implicit-function-declaration] ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM); ^ cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:273: drivers/gpu/drm/vmwgfx/vmwgfx_drv.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/gpu/drm/vmwgfx] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:516: drivers/gpu] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1847: drivers] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 48 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 CROSS_COMPILE=/opt/cross/kisskb/br-aarch64-glibc-2016.08-613-ge98b4dd/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_arm64-randconfig_arm64-gcc5.4 # Build took: 0:04:49.243006