# git rev-parse -q --verify 38c1e0c65865426676123cc9a127526fa02bcac6^{commit} 38c1e0c65865426676123cc9a127526fa02bcac6 already have revision, skipping fetch # git checkout -q -f -B kisskb 38c1e0c65865426676123cc9a127526fa02bcac6 # git clean -qxdf # < git log -1 # commit 38c1e0c65865426676123cc9a127526fa02bcac6 # Merge: 1424c3e309bb 777c1e01cb7e # Author: Linus Torvalds # Date: Thu Feb 9 17:52:00 2023 -0800 # # Merge tag 'drm-fixes-2023-02-10' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "Weekly fixes. # # The amdgpu had a few small fixes to display flicker on certain # configurations, however it was found the the flicker was lessened but # there were other unintended consequences, so for now they've been # reverted and replaced with an option for users to test with so future # fixes can be developed. # # Otherwise apart from the usual bunch of i915 and amdgpu, there's a # client, virtio-gpu and an nvidiafb fix that reorders its loading to # avoid failure. # # client: # - refcount fix # # amdgpu: # - a bunch of attempted flicker fixes that regressed turned into a # user workaround option for now # - Properly fix S/G display with AGP aperture enabled # - Fix cursor offset with 180 rotation # - SMU13 fixes # - Use TGID for GPUVM traces # - Fix oops on in fence error path # - Don't run IB tests on hw rings when sw rings are in use # - memory leak fix # # i915: # - Display watermark fix # - fbdev fix for PSR, FBC, DRRS # - Move fd_install after last use of fence # - Initialize the obj flags for shmem objects # - Fix VBT DSI DVO port handling # # virtio-gpu: # - fence fix # # nvidiafb: # - regression fix for driver load when no hw supported" # # * tag 'drm-fixes-2023-02-10' of git://anongit.freedesktop.org/drm/drm: (27 commits) # Revert "drm/amd/display: disable S/G display on DCN 3.1.5" # Revert "drm/amd/display: disable S/G display on DCN 2.1.0" # Revert "drm/amd/display: disable S/G display on DCN 3.1.2/3" # drm/amdgpu: add S/G display parameter # drm/amdgpu/smu: skip pptable init under sriov # amd/amdgpu: remove test ib on hw ring # drm/amdgpu/fence: Fix oops due to non-matching drm_sched init/fini # drm/amdgpu: Use the TGID for trace_amdgpu_vm_update_ptes # drm/amdgpu: Add unique_id support for GC 11.0.1/2 # drm/amd/pm: bump SMU 13.0.7 driver_if header version # drm/amd/pm: bump SMU 13.0.0 driver_if header version # drm/amd/pm: add SMU 13.0.7 missing GetPptLimit message mapping # drm/amd/display: fix cursor offset on rotation 180 # drm/amd/amdgpu: enable athub cg 11.0.3 # Revert "drm/amd/display: disable S/G display on DCN 3.1.4" # drm/amd/display: properly handling AGP aperture in vm setup # drm/amd/display: disable S/G display on DCN 3.1.2/3 # drm/amd/display: disable S/G display on DCN 2.1.0 # drm/i915: Fix VBT DSI DVO port handling # drm/client: fix circular reference counting issue # ... # < /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 38c1e0c65865426676123cc9a127526fa02bcac6 # < make -s -j 24 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 24 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 24 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:12645:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:12650:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:12652:warning: override: reassigning to symbol UML_NET_SLIP .config:12655:warning: override: reassigning to symbol UML_NET_MCAST .config:12657:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 24 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/arch/um/os-Linux/util.c:17:24: fatal error: sys/random.h: No such file or directory compilation terminated. make[3]: *** [/kisskb/src/scripts/Makefile.build:252: arch/um/os-Linux/util.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:504: arch/um/os-Linux] 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:94: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:2157: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:2161:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:252: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[5]: *** [/kisskb/src/scripts/Makefile.build:504: drivers/gpu/drm/amd/amdgpu] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:504: drivers/gpu/drm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:504: drivers/gpu] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:504: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:2021: .] Error 2 make: *** [Makefile:242: __sub-make] Error 2 Command 'make -s -j 24 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:24:58.959491