# git rev-parse -q --verify 8186749621ed6b8fc42644c399e8c755a2b6f630^{commit} 8186749621ed6b8fc42644c399e8c755a2b6f630 already have revision, skipping fetch # git checkout -q -f -B kisskb 8186749621ed6b8fc42644c399e8c755a2b6f630 # git clean -qxdf # < git log -1 # commit 8186749621ed6b8fc42644c399e8c755a2b6f630 # Merge: e4a7b2dc35d9 dc100bc8fae5 # Author: Linus Torvalds # Date: Wed Aug 5 19:50:06 2020 -0700 # # Merge tag 'drm-next-2020-08-06' of git://anongit.freedesktop.org/drm/drm # # Pull drm updates from Dave Airlie: # "New xilinx displayport driver, AMD support for two new GPUs (more # header files), i915 initial support for RocketLake and some work on # their DG1 (discrete chip). # # The core also grew some lockdep annotations to try and constrain what # drivers do with dma-fences, and added some documentation on why the # idea of indefinite fences doesn't work. # # The long list is below. # # I do have some fixes trees outstanding, but I'll follow up with those # later. # # core: # - add user def flag to cmd line modes # - dma_fence_wait added might_sleep # - dma-fence lockdep annotations # - indefinite fences are bad documentation # - gem CMA functions used in more drivers # - struct mutex removal # - more drm_ debug macro usage # - set/drop master api fixes # - fix for drm/mm hole size comparison # - drm/mm remove invalid entry optimization # - optimise drm/mm hole handling # - VRR debugfs added # - uncompressed AFBC modifier support # - multiple display id blocks in EDID # - multiple driver sg handling fixes # - __drm_atomic_helper_crtc_reset in all drivers # - managed vram helpers # # ttm: # - ttm_mem_reg handling cleanup # - remove bo offset field # - drop CMA memtype flag # - drop mappable flag # # xilinx: # - New Xilinx ZynqMP DisplayPort Subsystem driver # # nouveau: # - add CRC support # - start using NVIDIA published class header files # - convert all push buffer emission to new macros # - Proper push buffer space management for EVO/NVD channels. # - firmware loading fixes # - 2MiB system memory pages support on Pascal and newer # # vkms: # - larger cursor support # # i915: # - Rocketlake platform enablement # - Early DG1 enablement # - Numerous GEM refactorings # - DP MST fixes # - FBC, PSR, Cursor, Color, Gamma fixes # - TGL, RKL, EHL workaround updates # - TGL 8K display support fixes # - SDVO/HDMI/DVI fixes # # amdgpu: # - Initial support for Sienna Cichlid GPU # - Initial support for Navy Flounder GPU # - SI UVD/VCE support # - expose rotation property # - Add support for unique id on Arcturus # - Enable runtime PM on vega10 boards that support BACO # - Skip BAR resizing if the bios already did id # - Major swSMU code cleanup # - Fixes for DCN bandwidth calculations # # amdkfd: # - Track SDMA usage per process # - SMI events interface # # radeon: # - Default to on chip GART for AGP boards on all arches # - Runtime PM reference count fixes # # msm: # - headers regenerated causing churn # - a650/a640 display and GPU enablement # - dpu dither support for 6bpc panels # - dpu cursor fix # - dsi/mdp5 enablement for sdm630/sdm636/sdm66 # # tegra: # - video capture prep support # - reflection support # # mediatek: # - convert mtk_dsi to bridge API # # meson: # - FBC support # # sun4i: # - iommu support # # rockchip: # - register locking fix # - per-pixel alpha support PX30 VOP # # mgag200: # - ported to simple and shmem helpers # - device init cleanups # - use managed pci functions # - dropped hw cursor support # # ast: # - use managed pci functions # - use managed VRAM helpers # - rework cursor support # # malidp: # - dev_groups support # # hibmc: # - refactor hibmc_drv_vdac: # # vc4: # - create TXP CRTC # # imx: # - error path fixes and cleanups # # etnaviv: # - clock handling and error handling cleanups # - use pin_user_pages" # # * tag 'drm-next-2020-08-06' of git://anongit.freedesktop.org/drm/drm: (1747 commits) # drm/msm: use kthread_create_worker instead of kthread_run # drm/msm/mdp5: Add MDP5 configuration for SDM636/660 # drm/msm/dsi: Add DSI configuration for SDM660 # drm/msm/mdp5: Add MDP5 configuration for SDM630 # drm/msm/dsi: Add phy configuration for SDM630/636/660 # drm/msm/a6xx: add A640/A650 hwcg # drm/msm/a6xx: hwcg tables in gpulist # drm/msm/dpu: add SM8250 to hw catalog # drm/msm/dpu: add SM8150 to hw catalog # drm/msm/dpu: intf timing path for displayport # drm/msm/dpu: set missing flush bits for INTF_2 and INTF_3 # drm/msm/dpu: don't use INTF_INPUT_CTRL feature on sdm845 # drm/msm/dpu: move some sspp caps to dpu_caps # drm/msm/dpu: update UBWC config for sm8150 and sm8250 # drm/msm/dpu: use right setup_blend_config for sm8150 and sm8250 # drm/msm/a6xx: set ubwc config for A640 and A650 # drm/msm/adreno: un-open-code some packets # drm/msm: sync generated headers # drm/msm/a6xx: add build_bw_table for A640/A650 # drm/msm/a6xx: fix crashstate capture for A650 # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 8186749621ed6b8fc42644c399e8c755a2b6f630 # < make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:12386:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- In file included from /kisskb/src/arch/mips/include/asm/bug.h:42, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/linux/seqlock.h: In function 'write_seqcount_begin_nested': /kisskb/src/include/asm-generic/percpu.h:31:40: error: implicit declaration of function 'raw_smp_processor_id'; did you mean 'mips_set_process_fp_mode'? [-Werror=implicit-function-declaration] #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^~~~ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^~~~~~~~~~~~~ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/include/linux/smp.h:82, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/time32.h:13, from /kisskb/src/include/linux/time.h:74, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/arch/mips/include/asm/smp.h: At top level: /kisskb/src/arch/mips/include/asm/smp.h:28:19: error: static declaration of 'raw_smp_processor_id' follows non-static declaration static inline int raw_smp_processor_id(void) ^~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/mips/include/asm/bug.h:42, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/asm-generic/percpu.h:31:40: note: previous implicit declaration of 'raw_smp_processor_id' was here #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^~~~~~~~~~~~~ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^~~~ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^~~~~~~~~~~~~ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:114: arch/mips/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1185: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 80 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:00:17.667829