# git rev-parse -q --verify 68a32ba14177d4a21c4a9a941cf1d7aea86d436f^{commit} 68a32ba14177d4a21c4a9a941cf1d7aea86d436f already have revision, skipping fetch # git checkout -q -f -B kisskb 68a32ba14177d4a21c4a9a941cf1d7aea86d436f # git clean -qxdf # < git log -1 # commit 68a32ba14177d4a21c4a9a941cf1d7aea86d436f # Merge: 3aa139aa9fdc a1a1ca70deb3 # Author: Linus Torvalds # Date: Wed Apr 28 10:01:40 2021 -0700 # # Merge tag 'drm-next-2021-04-28' of git://anongit.freedesktop.org/drm/drm # # Pull drm updates from Dave Airlie: # "The usual lots of work all over the place. # # i915 has gotten some Alderlake work and prelim DG1 code, along with a # major locking rework over the GEM code, and brings back the property # of timing out long running jobs using a watchdog. amdgpu has some # Alderbran support (new GPU), freesync HDMI support along with a lot # other fixes. # # Outside of the drm, there is a new printf specifier added which should # have all the correct acks/sobs: # # - printk fourcc modifier support added %p4cc # # Summary: # # core: # - drm_crtc_commit_wait # - atomic plane state helpers reworked for full state # - dma-buf heaps API rework # - edid: rework and improvements for displayid # # dp-mst: # - better topology logging # # bridge: # - Chipone ICN6211 # - Lontium LT8912B # - anx7625 regulator support # # panel: # - fix lt9611 4k panels handling # # simple-kms: # - add plane state helpers # # ttm: # - debugfs support # - removal of unused sysfs # - ignore signaled moved fences # - ioremap buffer according to mem caching # # i915: # - Alderlake S enablement # - Conversion to dma_resv_locking # - Bring back watchdog timeout support # - legacy ioctl cleanups # - add GEM TDDO and RFC process # - DG1 LMEM preparation work # - intel_display.c refactoring # - Gen9/TGL PCH combination support # - eDP MSO Support # - multiple PSR instance support # - Link training debug updates # - Disable PSR2 support on JSL/EHL # - DDR5/LPDDR5 support for bw calcs # - LSPCON limited to gen9/10 platforms # - HSW/BDW async flip/VTd corruption workaround # - SAGV watermark fixes # - SNB hard hang on ring resume fix # - Limit imported dma-buf size # - move to use new tasklet API # - refactor KBL/TGL/ADL-S display/gt steppings # - refactoring legacy DP/HDMI, FB plane code out # # amdgpu: # - uapi: add ioctl to query video capabilities # - Iniital AMD Freesync HDMI support # - Initial Adebaran support # - 10bpc dithering improvements # - DCN secure display support # - Drop legacy IO BAR requirements # - PCIE/S0ix/RAS/Prime/Reset fixes # - Display ASSR support # - SMU gfx busy queues for RV/PCO # - Initial LTTPR display work # # amdkfd: # - MMU notifier fixes # - APU fixes # # radeon: # - debugfs cleanps # - fw error handling ifix # - Flexible array cleanups # # msm: # - big DSI phy/pll cleanup # - sc7280 initial support # - commong bandwidth scaling path # - shrinker locking contention fixes # - unpin/swap support for GEM objcets # # ast: # - cursor plane handling reworked # # tegra: # - don't register DP AUX channels before connectors # # zynqmp: # - fix OOB struct padding memset # # gma500: # - drop ttm and medfield support # # exynos: # - request_irq cleanup function # # mediatek: # - fine tune line time for EOTp # - MT8192 dpi support # - atomic crtc config updates # - don't support HDMI connector creation # # mxsdb: # - imx8mm support # # panfrost: # - MMU IRQ handling rework # # qxl: # - locking fixes # - resource deallocation changes # # sun4i: # - add alpha properties to UI/VI layers # # vc4: # - RPi4 CEC support # # vmwgfx: # - doc cleanups # # arc: # - moved to drm/tiny" # # * tag 'drm-next-2021-04-28' of git://anongit.freedesktop.org/drm/drm: (1390 commits) # drm/ttm: Don't count pages in SG BOs against pages_limit # drm/ttm: fix return value check # drm/bridge: lt8912b: fix incorrect handling of of_* return values # drm: bridge: fix LONTIUM use of mipi_dsi_() functions # drm: bridge: fix ANX7625 use of mipi_dsi_() functions # drm/amdgpu: page retire over debugfs mechanism # drm/radeon: Fix a missing check bug in radeon_dp_mst_detect() # drm/amd/display: Fix the Wunused-function warning # drm/radeon/r600: Fix variables that are not used after assignment # drm/amdgpu/smu7: fix CAC setting on TOPAZ # drm/amd/display: Update DCN302 SR Exit Latency # drm/amdgpu: enable ras eeprom on aldebaran # drm/amdgpu: RAS harvest on driver load # drm/amdgpu: add ras aldebaran ras eeprom driver # drm/amd/pm: increase time out value when sending msg to SMU # drm/amdgpu: add DMUB outbox event IRQ source define/complete/debug flag # drm/amd/pm: add the callback to get vbios bootup values for vangogh # drm/radeon: Fix size overflow # drm/amdgpu: Fix size overflow # drm/amdgpu: move mmhub ras_func init to ip specific file # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 68a32ba14177d4a21c4a9a941cf1d7aea86d436f # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig KCONFIG_SEED=0x48D672DE # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:6265:warning: override: reassigning to symbol STANDALONE .config:6269:warning: override: reassigning to symbol PPC64 .config:6270:warning: override: reassigning to symbol PPC_DISABLE_WERROR .config:6271:warning: override: reassigning to symbol SECTION_MISMATCH_WARN_ONLY .config:6272:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/fs/btrfs/tree-checker.c: In function 'check_root_item': /kisskb/src/fs/btrfs/tree-checker.c:1071:9: warning: missing braces around initializer [-Wmissing-braces] struct btrfs_root_item ri = { 0 }; ^ /kisskb/src/fs/btrfs/tree-checker.c:1071:9: warning: (near initialization for 'ri.inode') [-Wmissing-braces] /kisskb/src/drivers/clk/xilinx/xlnx_vcu.c: In function 'xvcu_register_clock_provider': /kisskb/src/drivers/clk/xilinx/xlnx_vcu.c:524:9: warning: missing braces around initializer [-Wmissing-braces] struct clk_parent_data parent_data[2] = { 0 }; ^ /kisskb/src/drivers/clk/xilinx/xlnx_vcu.c:524:9: warning: (near initialization for 'parent_data[0]') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/xlnx/zynqmp_dp.c: In function 'zynqmp_dp_update_vs_emph': /kisskb/src/drivers/gpu/drm/xlnx/zynqmp_dp.c:667:9: warning: missing braces around initializer [-Wmissing-braces] union phy_configure_opts opts = { 0 }; ^ /kisskb/src/drivers/gpu/drm/xlnx/zynqmp_dp.c:667:9: warning: (near initialization for 'opts.mipi_dphy') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c: In function 'amdgpu_gfx_ras_late_init': /kisskb/src/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:610:9: warning: missing braces around initializer [-Wmissing-braces] struct ras_query_if info = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c:610:9: warning: (near initialization for 'info.head') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c: In function 'bios_parser_get_i2c_info': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:297:9: warning: missing braces around initializer [-Wmissing-braces] struct atom_i2c_record dummy_record = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/bios/bios_parser2.c:297:9: warning: (near initialization for 'dummy_record.record_header') [-Wmissing-braces] /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: In function 'amdgpu_dm_psr_enable': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:10488:9: warning: missing braces around initializer [-Wmissing-braces] struct dc_static_screen_params params = {0}; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:10488:9: warning: (near initialization for 'params.triggers') [-Wmissing-braces] In file included from /kisskb/src/include/linux/init.h:5:0, from /kisskb/src/include/linux/kgdb.h:17, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:30, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services_types.h:29, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/dm_services.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:27: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c: In function 'dcn_bw_apply_registry_override': /kisskb/src/include/linux/compiler.h:61:16: error: implicit declaration of function 'enable_kernel_altivec' [-Werror=implicit-function-declaration] static struct ftrace_branch_data \ ^ /kisskb/src/include/linux/compiler.h:58:69: note: in expansion of macro '__trace_if_value' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^ /kisskb/src/include/linux/compiler.h:56:28: note: in expansion of macro '__trace_if_var' #define if(cond, ...) if ( __trace_if_var( !!(cond , ## __VA_ARGS__) ) ) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:65:9: note: in expansion of macro 'if' } else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) { \ ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:638:2: note: in expansion of macro 'DC_FP_START' DC_FP_START(); ^ /kisskb/src/include/linux/compiler.h:61:16: error: implicit declaration of function 'disable_kernel_altivec' [-Werror=implicit-function-declaration] static struct ftrace_branch_data \ ^ /kisskb/src/include/linux/compiler.h:58:69: note: in expansion of macro '__trace_if_value' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^ /kisskb/src/include/linux/compiler.h:56:28: note: in expansion of macro '__trace_if_var' #define if(cond, ...) if ( __trace_if_var( !!(cond , ## __VA_ARGS__) ) ) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:77:9: note: in expansion of macro 'if' } else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) { \ ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.c:674:2: note: in expansion of macro 'DC_FP_END' DC_FP_END(); ^ cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../display/dc/calcs/dcn_calcs.o] Error 1 make[5]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/init.h:5:0, from /kisskb/src/include/linux/kgdb.h:17, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:30, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/dc_types.h:32, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/inc/hw/dccg.h:29, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c:26: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c: In function 'dcn3_init_clocks': /kisskb/src/include/linux/compiler.h:61:16: error: implicit declaration of function 'enable_kernel_altivec' [-Werror=implicit-function-declaration] static struct ftrace_branch_data \ ^ /kisskb/src/include/linux/compiler.h:58:69: note: in expansion of macro '__trace_if_value' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^ /kisskb/src/include/linux/compiler.h:56:28: note: in expansion of macro '__trace_if_var' #define if(cond, ...) if ( __trace_if_var( !!(cond , ## __VA_ARGS__) ) ) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:65:9: note: in expansion of macro 'if' } else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) { \ ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c:214:2: note: in expansion of macro 'DC_FP_START' DC_FP_START(); ^ /kisskb/src/include/linux/compiler.h:61:16: error: implicit declaration of function 'disable_kernel_altivec' [-Werror=implicit-function-declaration] static struct ftrace_branch_data \ ^ /kisskb/src/include/linux/compiler.h:58:69: note: in expansion of macro '__trace_if_value' #define __trace_if_var(cond) (__builtin_constant_p(cond) ? (cond) : __trace_if_value(cond)) ^ /kisskb/src/include/linux/compiler.h:56:28: note: in expansion of macro '__trace_if_var' #define if(cond, ...) if ( __trace_if_var( !!(cond , ## __VA_ARGS__) ) ) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/os_types.h:77:9: note: in expansion of macro 'if' } else if (cpu_has_feature(CPU_FTR_ALTIVEC_COMP)) { \ ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c:216:2: note: in expansion of macro 'DC_FP_END' DC_FP_END(); ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn21/rn_clk_mgr.c: In function 'rn_clk_mgr_construct': /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn21/rn_clk_mgr.c:893:9: warning: missing braces around initializer [-Wmissing-braces] struct dpm_clocks clock_table = { 0 }; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn21/rn_clk_mgr.c:893:9: warning: (near initialization for 'clock_table.DcfClocks') [-Wmissing-braces] cc1: some warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/gpu/drm/amd/amdgpu/../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:514: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1872: drivers] Error 2 make: *** [Makefile:215: __sub-make] Error 2 Command 'make -s -j 48 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc4.9 # Build took: 0:05:20.618781