# git rev-parse -q --verify 38bc4ac431684498126f9baa3a530e5a132f0173^{commit} 38bc4ac431684498126f9baa3a530e5a132f0173 already have revision, skipping fetch # git checkout -q -f -B kisskb 38bc4ac431684498126f9baa3a530e5a132f0173 # git clean -qxdf # < git log -1 # commit 38bc4ac431684498126f9baa3a530e5a132f0173 # Merge: cbe232ab07ab 1e9124df8be0 # Author: Linus Torvalds # Date: Fri Jun 24 11:43:49 2022 -0700 # # Merge tag 'drm-fixes-2022-06-24' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "Fixes for this week, bit larger than normal, but I think the last # couple have been quieter, and it's only rc4. # # There are a lot of small msm fixes, and a slightly larger set of vc4 # fixes. The vc4 fixes clean up a lot of crashes around the rPI4 # hardware differences from earlier ones, and problems in the page flip # and modeset code which assumed earlier hw, so I thought it would be # okay to keep them in. # # Otherwise, it's a few amdgpu, i915, sun4i and a panel quirk. # # amdgpu: # - Adjust GTT size logic # - eDP fix for RMB # - DCN 3.15 fix # - DP training fix # - Color encoding fix for DCN2+ # # sun4i: # - multiple suspend fixes # # vc4: # - rework driver split for rpi4, fixes mulitple crashers. # # panel: # - quirk for Aya Neo Next # # i915: # - Revert low voltage SKU check removal to fix display issues # - Apply PLL DCO fraction workaround for ADL-S # - Don't show engine classes not present in client fdinfo # # msm: # - Workaround for parade DSI bridge power sequencing # - Fix for multi-planar YUV format offsets # - Limiting WB modes to max sspp linewidth # - Fixing the supported rotations to add 180 back for IGT # - Fix to handle pm_runtime_get_sync() errors to avoid unclocked # access in the bind() path for dpu driver # - Fix the irq_free() without request issue which was a being hit # frequently in CI. # - Fix to add minimum ICC vote in the msm_mdss pm_resume path to # address bootup splats # - Fix to avoid dereferencing without checking in WB encoder # - Fix to avoid crash during suspend in DP driver by ensuring # interrupt mask bits are updated # - Remove unused code from dpu_encoder_virt_atomic_check() # - Fix to remove redundant init of dsc variable # - Fix to ensure mmap offset is initialized to avoid memory corruption # from unpin/evict # - Fix double runpm disable in probe-defer path # - VMA fenced-unpin fixes # - Fix for WB max-width # - Fix for rare dp resolution change issue" # # * tag 'drm-fixes-2022-06-24' of git://anongit.freedesktop.org/drm/drm: (41 commits) # amd/display/dc: Fix COLOR_ENCODING and COLOR_RANGE doing nothing for DCN20+ # drm/amd/display: Fix typo in override_lane_settings # drm/amd/display: Fix DC warning at driver load # drm/amd: Revert "drm/amd/display: keep eDP Vdd on when eDP stream is already enabled" # drm/amdgpu: Adjust logic around GTT size (v3) # drm/sun4i: Return if frontend is not present # drm/vc4: fix error code in vc4_check_tex_size() # drm/sun4i: Add DMA mask and segment size # drm/vc4: hdmi: Fixed possible integer overflow # drm/i915/display: Re-add check for low voltage sku for max dp source rate # drm/i915/fdinfo: Don't show engine classes not present # drm/i915: Implement w/a 22010492432 for adl-s # drm: panel-orientation-quirks: Add quirk for Aya Neo Next # drm/msm/dp: force link training for display resolution change # drm/msm/dpu: limit wb modes based on max_mixer_width # drm/msm/dp: check core_initialized before disable interrupts at dp_display_unbind() # drm/msm/mdp4: Fix refcount leak in mdp4_modeset_init_intf # drm/msm: Don't overwrite hw fence in hw_init # drm/msm: Drop update_fences() # drm/vc4: Warn if some v3d code is run on BCM2711 # ... # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 38bc4ac431684498126f9baa3a530e5a132f0173 # < make -s -j 120 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 120 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 120 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 120 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/machvec.c: In function 'sh_mv_setup': /kisskb/src/arch/sh/kernel/machvec.c:105:33: error: array subscript 'struct sh_machine_vector[0]' is partly outside array bounds of 'long int[1]' [-Werror=array-bounds] 105 | sh_mv = *(struct sh_machine_vector *)&__machvec_start; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/sh/kernel/machvec.c:13: /kisskb/src/arch/sh/include/asm/sections.h:7:13: note: while referencing '__machvec_start' 7 | extern long __machvec_start, __machvec_end; | ^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sh/kernel/machvec.o] Error 1 make[3]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:594, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:13, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:31: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:9: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:9: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:34: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sh/kernel/cpu/sh2/setup-sh7619.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:466: arch/sh/kernel/cpu/sh2] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:466: arch/sh/kernel/cpu] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: arch/sh/kernel] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1843: arch/sh] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/mfd/asic3.c: In function 'asic3_mfd_remove': /kisskb/src/drivers/mfd/asic3.c:941:23: error: unused variable 'asic' [-Werror=unused-variable] 941 | struct asic3 *asic = platform_get_drvdata(pdev); | ^~~~ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:249: drivers/mfd/asic3.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/mfd] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/tty/serial/sh-sci.c: In function 'sci_remap_port': /kisskb/src/drivers/tty/serial/sh-sci.c:2655:26: error: unused variable 'sport' [-Werror=unused-variable] 2655 | struct sci_port *sport = to_sci_port(port); | ^~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:249: drivers/tty/serial/sh-sci.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/tty/serial] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/tty] Error 2 make[1]: *** [/kisskb/src/Makefile:1843: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 120 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh-allmodconfig_sh4-gcc11 # Build took: 0:01:27.243095