# git rev-parse -q --verify fcadab740480e0e0e9fa9bd272acd409884d431a^{commit} fcadab740480e0e0e9fa9bd272acd409884d431a already have revision, skipping fetch # git checkout -q -f -B kisskb fcadab740480e0e0e9fa9bd272acd409884d431a # git clean -qxdf # < git log -1 # commit fcadab740480e0e0e9fa9bd272acd409884d431a # Merge: aa5ff93523eb 132d7c8abeaa # Author: Linus Torvalds # Date: Thu Oct 1 09:45:37 2020 -0700 # # Merge tag 'drm-fixes-2020-10-01-1' of git://anongit.freedesktop.org/drm/drm # # Pull drm fixes from Dave Airlie: # "AMD and vmwgfx fixes. # # Just dequeuing these a bit early as the AMD ones are bit larger than # I'd prefer, but Alex missed last week so it's a double set of fixes. # The larger ones are just register header fixes for the new chips that # were just introduced in rc1 along with some new PCI IDs for new hw. # Otherwise it is usual fixes. # # The vmwgfx fix was due to some testing I was doing and found we # weren't booting properly, vmware had the fix internally so hurried it # # vmwgfx: # - fix a regression due to TTM refactor # # amdgpu: # - Fix potential double free in userptr handling # - Sienna Cichlid and Navy Flounder udpates # - Add Sienna Cichlid PCI IDs # - Drop experimental flag for navi12 # - Raven fixes # - Renoir fixes # - HDCP fix # - DCN3 fix for clang and older versions of gcc # - Fix a runtime pm refcount issue" # # * tag 'drm-fixes-2020-10-01-1' of git://anongit.freedesktop.org/drm/drm: # drm/amdgpu: disable gfxoff temporarily for navy_flounder # drm/amd/pm: setup APU dpm clock table in SMU HW initialization # drm/vmwgfx: Fix error handling in get_node # drm/amd/display: remove duplicate call to rn_vbios_smu_get_smu_version() # drm/amdgpu/swsmu/smu12: fix force clock handling for mclk # drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config # drm/amdgpu/display: fix CFLAGS setup for DCN30 # drm/amd/display: fix return value check for hdcp_work # drm/amdgpu: remove gpu_info fw support for sienna_cichlid etc. # drm/amd/pm: Removed fixed clock in auto mode DPM # drm/amdgpu: remove experimental flag from navi12 # drm/amdgpu: add device ID for sienna_cichlid (v2) # drm/amdgpu: use the AV1 defines for VCN 3.0 # drm/amdgpu: add VCN 3.0 AV1 registers # drm/amdgpu: add the GC 10.3 VRS registers # drm/amdgpu: prevent double kfree ttm->sg # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 fcadab740480e0e0e9fa9bd272acd409884d431a # < make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- sh7770_generic_defconfig # < make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:283: scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration sh4-linux-gcc: error: command line option '-m4-nofpu' is not supported by this configuration make[2]: *** [/kisskb/src/scripts/Makefile.build:117: scripts/mod/devicetable-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1197: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 80 ARCH=sh O=/kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh7770_generic_defconfig_sh4-gcc4.9 # Build took: 0:00:05.992976