# git rev-parse -q --verify a2d635decbfa9c1e4ae15cb05b68b2559f7f827c^{commit} a2d635decbfa9c1e4ae15cb05b68b2559f7f827c already have revision, skipping fetch # git checkout -q -f -B kisskb a2d635decbfa9c1e4ae15cb05b68b2559f7f827c # git clean -qxdf # < git log -1 # commit a2d635decbfa9c1e4ae15cb05b68b2559f7f827c # Merge: 89c3b37af87e eb85d03e01c3 # Author: Linus Torvalds # Date: Wed May 8 21:35:19 2019 -0700 # # Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm # # Pull drm updates from Dave Airlie: # "This has two exciting community drivers for ARM Mali accelerators. # Since ARM has never been open source friendly on the GPU side of the # house, the community has had to create open source drivers for the # Mali GPUs. Lima covers the older t4xx and panfrost the newer 6xx/7xx # series. Well done to all involved and hopefully this will help ARM # head in the right direction. # # There is also now the ability if you don't have any of the legacy # drivers enabled (pre-KMS) to remove all the pre-KMS support code from # the core drm, this saves 10% or so in codesize on my machine. # # i915 also enable Icelake/Elkhart Lake Gen11 GPUs by default, vboxvideo # moves out of staging. # # There are also some rcar-du patches which crossover with media tree # but all should be acked by Mauro. # # Summary: # # uapi changes: # - Colorspace connector property # - fourcc - new YUV formts # - timeline sync objects initially merged # - expose FB_DAMAGE_CLIPS to atomic userspace # # new drivers: # - vboxvideo: moved out of staging # - aspeed: ASPEED SoC BMC chip display support # - lima: ARM Mali4xx GPU acceleration driver support # - panfrost: ARM Mali6xx/7xx Midgard/Bitfrost acceleration driver support # # core: # - component helper docs # - unplugging fixes # - devm device init # - MIPI/DSI rate control # - shmem backed gem objects # - connector, display_info, edid_quirks cleanups # - dma_buf fence chain support # - 64-bit dma-fence seqno comparison fixes # - move initial fb config code to core # - gem fence array helpers for Lima # - ability to remove legacy support code if no drivers requires it (removes 10% of drm.ko size) # - lease fixes # # ttm: # - unified DRM_FILE_PAGE_OFFSET handling # - Account for kernel allocations in kernel zone only # # panel: # - OSD070T1718-19TS panel support # - panel-tpo-td028ttec1 backlight support # - Ronbo RB070D30 MIPI/DSI # - Feiyang FY07024DI26A30-D MIPI-DSI panel # - Rocktech jh057n00900 MIPI-DSI panel # # i915: # - Comet Lake (Gen9) PCI IDs # - Updated Icelake PCI IDs # - Elkhartlake (Gen11) support # - DP MST property addtions # - plane and watermark fixes # - Icelake port sync and VEBOX disable fixes # - struct_mutex usage reduction # - Icelake gamma fix # - GuC reset fixes # - make mmap more asynchronous # - sound display power well race fixes # - DDI/MIPI-DSI clocks for Icelake # - Icelake RPS frequency changing support # - Icelake workarounds # # amdgpu: # - Use HMM for userptr # - vega20 experimental smu11 support # - RAS support for vega20 # - BACO support for vega12 + fixes for vega20 # - reworked IH interrupt handling # - amdkfd RAS support # - Freesync improvements # - initial timeline sync object support # - DC Z ordering fixes # - NV12 planes support # - colorspace properties for planes= # - eDP opts if eDP already initialized # # nouveau: # - misc fixes # # etnaviv: # - misc fixes # # msm: # - GPU zap shader support expansion # - robustness ABI addition # # exynos: # - Logging cleanups # # tegra: # - Shared reset fix # - CPU cache maintenance fix # # cirrus: # - driver rewritten using simple helpers # # meson: # - G12A support # # vmwgfx: # - Resource dirtying management improvements # - Userspace logging improvements # # virtio: # - PRIME fixes # # rockchip: # - rk3066 hdmi support # # sun4i: # - DSI burst mode support # # vc4: # - load tracker to detect underflow # # v3d: # - v3d v4.2 support # # malidp: # - initial Mali D71 support in komeda driver # # tfp410: # - omap related improvement # # omapdrm: # - drm bridge/panel support # - drop some omap specific panels # # rcar-du: # - Display writeback support" # # * tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm: (1507 commits) # drm/msm/a6xx: No zap shader is not an error # drm/cma-helper: Fix drm_gem_cma_free_object() # drm: Fix timestamp docs for variable refresh properties. # drm/komeda: Mark the local functions as static # drm/komeda: Fixed warning: Function parameter or member not described # drm/komeda: Expose bus_width to Komeda-CORE # drm/komeda: Add sysfs attribute: core_id and config_id # drm: add non-desktop quirk for Valve HMDs # drm/panfrost: Show stored feature registers # drm/panfrost: Don't scream about deferred probe # drm/panfrost: Disable PM on probe failure # drm/panfrost: Set DMA masks earlier # drm/panfrost: Add sanity checks to submit IOCTL # drm/etnaviv: initialize idle mask before querying the HW db # drm: introduce a capability flag for syncobj timeline support # drm: report consistent errors when checking syncobj capibility # drm/nouveau/nouveau: forward error generated while resuming objects tree # drm/nouveau/fb/ramgk104: fix spelling mistake "sucessfully" -> "successfully" # drm/nouveau/i2c: Disable i2c bus access after ->fini() # drm/nouveau: Remove duplicate ACPI_VIDEO_NOTIFY_PROBE definition # ... # < /opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux-gcc --version # < /opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux-ld --version # < git log --format=%s --max-count=1 a2d635decbfa9c1e4ae15cb05b68b2559f7f827c # < make -s -j 120 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # yes \n | make -s -j 120 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- oldconfig yes: standard output: Broken pipe # make -s -j 120 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- :1388:2: warning: #warning syscall open_tree not implemented [-Wcpp] :1391:2: warning: #warning syscall move_mount not implemented [-Wcpp] :1394:2: warning: #warning syscall fsopen not implemented [-Wcpp] :1397:2: warning: #warning syscall fsconfig not implemented [-Wcpp] :1400:2: warning: #warning syscall fsmount not implemented [-Wcpp] :1403:2: warning: #warning syscall fspick not implemented [-Wcpp] /kisskb/src/arch/xtensa/kernel/pci.c:45:32: warning: 'pci_ctrl_tail' defined but not used [-Wunused-variable] static struct pci_controller **pci_ctrl_tail = &pci_ctrl_head; ^ ./usr/include/asm/setup.h:17: userspace cannot reference function or variable defined in the kernel /kisskb/src/drivers/char/tpm/tpm2-cmd.c: In function 'tpm2_unseal_trusted': /kisskb/src/drivers/char/tpm/tpm2-cmd.c:670:2: warning: 'blob_handle' may be used uninitialized in this function [-Wmaybe-uninitialized] tpm2_flush_context(chip, blob_handle); ^ In file included from /kisskb/src/arch/xtensa/include/asm/atomic.h:21:0, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/asm-generic/bitops/atomic.h:5, from /kisskb/src/arch/xtensa/include/asm/bitops.h:222, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/kernel.h:12, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/wait.h:7, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ocfs2/file.c:27: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/xtensa/include/asm/cmpxchg.h:140:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/fs/ocfs2/file.c:2386:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^ /kisskb/src/drivers/hwtracing/intel_th/msu.c: In function 'msc_buffer_win_alloc': /kisskb/src/drivers/hwtracing/intel_th/msu.c:783:21: warning: unused variable 'i' [-Wunused-variable] int ret = -ENOMEM, i; ^ /kisskb/src/drivers/hwtracing/intel_th/msu.c: In function 'msc_buffer_win_free': /kisskb/src/drivers/hwtracing/intel_th/msu.c:863:6: warning: unused variable 'i' [-Wunused-variable] int i; ^ /kisskb/src/drivers/input/joystick/analog.c:172:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c: In function 'sh_mobile_i2c_isr': /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:399:26: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized] pd->msg->buf[real_pos] = data; ^ /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:372:16: note: 'data' was declared here unsigned char data; ^ /kisskb/src/drivers/misc/habanalabs/habanalabs_ioctl.c: In function 'debug_coresight': /kisskb/src/drivers/misc/habanalabs/habanalabs_ioctl.c:143:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] input = memdup_user((const void __user *) args->input_ptr, ^ In file included from /kisskb/src/include/linux/pci.h:31:0, from /kisskb/src/drivers/staging/kpc2000/kpc2000/core.c:4: /kisskb/src/drivers/staging/kpc2000/kpc2000/core.c: In function 'read_system_regs': /kisskb/src/drivers/staging/kpc2000/kpc2000/core.c:149:36: warning: format '%lx' expects argument of type 'long unsigned int', but argument 4 has type 'long long int' [-Wformat=] dev_err(&pcard->pdev->dev, "Invalid magic! Got: 0x%016llx Want: 0x%016lx\n", read_val, KP2000_MAGIC_VALUE); ^ /kisskb/src/include/linux/device.h:1400:22: note: in definition of macro 'dev_fmt' #define dev_fmt(fmt) fmt ^ /kisskb/src/drivers/staging/kpc2000/kpc2000/core.c:149:9: note: in expansion of macro 'dev_err' dev_err(&pcard->pdev->dev, "Invalid magic! Got: 0x%016llx Want: 0x%016lx\n", read_val, KP2000_MAGIC_VALUE); ^ /kisskb/src/drivers/staging/kpc2000/kpc2000/fileops.c: In function 'kp2000_cdev_read': /kisskb/src/drivers/staging/kpc2000/kpc2000/fileops.c:75:1: warning: the frame size of 1040 bytes is larger than 1024 bytes [-Wframe-larger-than=] } ^ In file included from /kisskb/src/drivers/staging/kpc2000/kpc_dma/fileops.c:11:0: /kisskb/src/arch/xtensa/include/asm/uaccess.h: In function 'clear_user': /kisskb/src/arch/xtensa/include/asm/uaccess.h:40:22: error: implicit declaration of function 'uaccess_kernel' [-Werror=implicit-function-declaration] #define __kernel_ok (uaccess_kernel()) ^ /kisskb/src/arch/xtensa/include/asm/uaccess.h:43:34: note: in expansion of macro '__kernel_ok' #define __access_ok(addr, size) (__kernel_ok || __user_ok((addr), (size))) ^ /kisskb/src/arch/xtensa/include/asm/uaccess.h:44:31: note: in expansion of macro '__access_ok' #define access_ok(addr, size) __access_ok((unsigned long)(addr), (size)) ^ /kisskb/src/arch/xtensa/include/asm/uaccess.h:271:6: note: in expansion of macro 'access_ok' if (access_ok(addr, size)) ^ In file included from /kisskb/src/include/linux/printk.h:330:0, from /kisskb/src/include/linux/kernel.h:15, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:9, from /kisskb/src/drivers/staging/kpc2000/kpc_dma/fileops.c:2: /kisskb/src/drivers/staging/kpc2000/kpc_dma/fileops.c: In function 'kpc_dma_transfer': /kisskb/src/drivers/staging/kpc2000/kpc_dma/fileops.c:58:35: warning: format '%ld' expects argument of type 'long int', but argument 7 has type 'size_t {aka unsigned int}' [-Wformat=] dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_transfer(priv = [%p], kcb = [%p], iov_base = [%p], iov_len = %ld) ldev = [%p]\n", priv, kcb, (void*)iov_base, iov_len, ldev); ^ /kisskb/src/include/linux/dynamic_debug.h:118:15: note: in definition of macro '__dynamic_func_call' func(&id, ##__VA_ARGS__); \ ^ /kisskb/src/include/linux/dynamic_debug.h:150:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt,__dynamic_dev_dbg, \ ^ /kisskb/src/include/linux/device.h:1493:2: note: in expansion of macro 'dynamic_dev_dbg' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/include/linux/device.h:1493:23: note: in expansion of macro 'dev_fmt' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/drivers/staging/kpc2000/kpc_dma/fileops.c:58:2: note: in expansion of macro 'dev_dbg' dev_dbg(&priv->ldev->pldev->dev, "kpc_dma_transfer(priv = [%p], kcb = [%p], iov_base = [%p], iov_len = %ld) ldev = [%p]\n", priv, kcb, (void*)iov_base, iov_len, ldev); ^ cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:278: drivers/staging/kpc2000/kpc_dma/fileops.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:489: drivers/staging/kpc2000/kpc_dma] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:489: drivers/staging/kpc2000] Error 2 make[3]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/rwsem.h:16:0, from /kisskb/src/include/linux/notifier.h:15, from /kisskb/src/include/linux/clk.h:17, from /kisskb/src/drivers/tty/serial/sh-sci.c:24: /kisskb/src/drivers/tty/serial/sh-sci.c: In function 'sci_dma_rx_submit': /kisskb/src/include/linux/spinlock.h:288:3: warning: 'flags' may be used uninitialized in this function [-Wmaybe-uninitialized] _raw_spin_unlock_irqrestore(lock, flags); \ ^ /kisskb/src/drivers/tty/serial/sh-sci.c:1353:16: note: 'flags' was declared here unsigned long flags; ^ In file included from /kisskb/src/arch/xtensa/include/asm/atomic.h:21:0, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/asm-generic/bitops/atomic.h:5, from /kisskb/src/arch/xtensa/include/asm/bitops.h:222, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:11: /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: In function 'ixgbevf_xdp_setup': /kisskb/src/arch/xtensa/include/asm/cmpxchg.h:140:3: warning: value computed is not used [-Wunused-value] ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c:4472:4: note: in expansion of macro 'xchg' xchg(&adapter->rx_ring[i]->xdp_prog, adapter->xdp_prog); ^ make[2]: *** [/kisskb/src/scripts/Makefile.build:489: drivers/staging] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1073: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:179: sub-make] Error 2 Command 'make -s -j 120 ARCH=xtensa O=/kisskb/build/linus_xtensa-allmodconfig_xtensa CROSS_COMPILE=/opt/cross/kisskb/br-xtensa-full-2016.08-613-ge98b4dd/bin/xtensa-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_xtensa-allmodconfig_xtensa # Build took: 0:02:47.411403