# 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/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 38bc4ac431684498126f9baa3a530e5a132f0173 # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:12357:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12362:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12364:warning: override: reassigning to symbol UML_NET_SLIP .config:12367:warning: override: reassigning to symbol UML_NET_MCAST .config:12369:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/drivers/nvdimm/pmem.c:48:20: error: conflicting types for 'to_phys' static phys_addr_t to_phys(struct pmem_device *pmem, phys_addr_t offset) ^ In file included from /kisskb/src/arch/um/include/asm/page.h:98:0, from /kisskb/src/arch/um/include/asm/thread_info.h:15, from /kisskb/src/include/linux/thread_info.h:60, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/um/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:55, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/include/linux/highmem.h:5, from /kisskb/src/include/linux/bvec.h:10, from /kisskb/src/include/linux/blk_types.h:10, from /kisskb/src/include/linux/blkdev.h:9, from /kisskb/src/drivers/nvdimm/pmem.c:10: /kisskb/src/arch/um/include/shared/mem.h:12:29: note: previous definition of 'to_phys' was here static inline unsigned long to_phys(void *virt) ^ In file included from /kisskb/src/arch/um/include/asm/page.h:114:0, from /kisskb/src/arch/um/include/asm/thread_info.h:15, from /kisskb/src/include/linux/thread_info.h:60, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/um/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:55, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/include/linux/highmem.h:5, from /kisskb/src/include/linux/bvec.h:10, from /kisskb/src/include/linux/blk_types.h:10, from /kisskb/src/include/linux/blkdev.h:9, from /kisskb/src/drivers/nvdimm/pmem.c:10: /kisskb/src/drivers/nvdimm/pmem.c: In function 'pmem_dax_zero_page_range': /kisskb/src/arch/um/include/asm/page.h:105:20: error: too few arguments to function 'to_phys' #define __pa(virt) to_phys((void *) (unsigned long) (virt)) ^ /kisskb/src/include/asm-generic/memory_model.h:18:41: note: in definition of macro '__pfn_to_page' #define __pfn_to_page(pfn) (mem_map + ((pfn) - ARCH_PFN_OFFSET)) ^ /kisskb/src/arch/um/include/asm/pgtable.h:276:40: note: in expansion of macro 'phys_to_pfn' #define phys_to_page(phys) pfn_to_page(phys_to_pfn(phys)) ^ /kisskb/src/arch/um/include/asm/pgtable.h:277:30: note: in expansion of macro 'phys_to_page' #define __virt_to_page(virt) phys_to_page(__pa(virt)) ^ /kisskb/src/arch/um/include/asm/pgtable.h:277:43: note: in expansion of macro '__pa' #define __virt_to_page(virt) phys_to_page(__pa(virt)) ^ /kisskb/src/arch/um/include/asm/pgtable.h:279:28: note: in expansion of macro '__virt_to_page' #define virt_to_page(addr) __virt_to_page((const unsigned long) addr) ^ /kisskb/src/arch/um/include/asm/pgtable.h:93:26: note: in expansion of macro 'virt_to_page' #define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page) ^ /kisskb/src/drivers/nvdimm/pmem.c:321:49: note: in expansion of macro 'ZERO_PAGE' return blk_status_to_errno(pmem_do_write(pmem, ZERO_PAGE(0), 0, ^ /kisskb/src/drivers/nvdimm/pmem.c:48:20: note: declared here static phys_addr_t to_phys(struct pmem_device *pmem, phys_addr_t offset) ^ /kisskb/src/drivers/nvdimm/pmem.c:324:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:249: drivers/nvdimm/pmem.o] Error 1 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/nvdimm] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:26: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1610:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1614:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:249: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:466: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1843: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:08:11.773882