diff --git a/.gitmodules b/.gitmodules index c2871b7..f94dbc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "submodules/zfsonlinux"] path = submodules/zfsonlinux url = ../zfsonlinux -[submodule "submodules/ubuntu-eoan"] - path = submodules/ubuntu-eoan - url = ../mirror_ubuntu-eoan-kernel +[submodule "submodules/ubuntu-focal"] + path = submodules/ubuntu-focal + url = ../mirror_ubuntu-focal-kernel diff --git a/Makefile b/Makefile index 7f13ac0..b6ef220 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change KERNEL_MAJ=5 -KERNEL_MIN=3 -KERNEL_PATCHLEVEL=18 +KERNEL_MIN=4 +KERNEL_PATCHLEVEL=22 # increment KREL if the ABI changes (abicheck target in debian/rules) # rebuild packages with new KREL and run 'make abiupdate' -KREL=2 +KREL=1 -PKGREL=2 +PKGREL=1 KERNEL_MAJMIN=$(KERNEL_MAJ).$(KERNEL_MIN) KERNEL_VER=$(KERNEL_MAJMIN).$(KERNEL_PATCHLEVEL) @@ -31,7 +31,7 @@ SKIPABI=0 BUILD_DIR=build -KERNEL_SRC=ubuntu-eoan +KERNEL_SRC=ubuntu-focal KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC) KERNEL_CFG_ORG=config-${KERNEL_VER}.org diff --git a/debian/scripts/find-firmware.pl b/debian/scripts/find-firmware.pl index b24e66e..9492bc9 100755 --- a/debian/scripts/find-firmware.pl +++ b/debian/scripts/find-firmware.pl @@ -8,7 +8,7 @@ die "no directory to scan" if !$dir; die "no such directory" if ! -d $dir; -die "strange directory name" if $dir !~ m|^(.*/)?(5.3.\d+\-\d+\-pve)(/+)?$|; +die "strange directory name: $dir" if $dir !~ m|^(.*/)?(5.\d.\d+\-\d+\-pve)(/+)?$|; my $apiver = $2; diff --git a/fwlist-previous b/fwlist-previous index c080f03..e3889b5 100644 --- a/fwlist-previous +++ b/fwlist-previous @@ -14,6 +14,15 @@ advansys/mcode.bin kernel/drivers/scsi/advansys.ko agere_ap_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko agere_sta_fw.bin kernel/drivers/net/wireless/intersil/orinoco/orinoco.ko aic94xx-seq.fw kernel/drivers/scsi/aic94xx/aic94xx.ko +amdgpu/arcturus_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/arcturus_gpu_info.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/arcturus_mec2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/arcturus_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/arcturus_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/arcturus_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/arcturus_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/arcturus_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/arcturus_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/banks_k_2_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/bonaire_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/bonaire_k_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko @@ -109,6 +118,37 @@ amdgpu/navi10_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/navi10_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/navi10_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/navi10_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_gpu_info.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_me.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_mec2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_pfp.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_sdma1.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi12_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_ce_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_gpu_info.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_me.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_mec2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_mec2_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_mec_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_me_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_pfp.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_pfp_wks.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_sdma1.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_sos.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/navi14_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/oland_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/oland_k_smc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/oland_mc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko @@ -217,6 +257,16 @@ amdgpu/raven_pfp.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/raven_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/raven_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/raven_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_asd.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_gpu_info.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_me.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_mec2.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_mec.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_pfp.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_rlc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_sdma.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko +amdgpu/renoir_vcn.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/si58_mc.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/stoney_ce.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko amdgpu/stoney_me.bin kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko @@ -659,31 +709,33 @@ hfi1_dc8051.fw kernel/drivers/infiniband/hw/hfi1/hfi1.ko hfi1_fabric.fw kernel/drivers/infiniband/hw/hfi1/hfi1.ko hfi1_pcie.fw kernel/drivers/infiniband/hw/hfi1/hfi1.ko hfi1_sbus.fw kernel/drivers/infiniband/hw/hfi1/hfi1.ko -i1480-phy-0.0.bin kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko -i1480-pre-phy-0.0.bin kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko -i1480-usb-0.0.bin kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko +i1480-phy-0.0.bin kernel/drivers/staging/uwb/i1480/dfu/i1480-dfu-usb.ko +i1480-pre-phy-0.0.bin kernel/drivers/staging/uwb/i1480/dfu/i1480-dfu-usb.ko +i1480-usb-0.0.bin kernel/drivers/staging/uwb/i1480/dfu/i1480-dfu-usb.ko i2400m-fw-usb-1.5.sbcf kernel/drivers/net/wimax/i2400m/i2400m-usb.ko i6050-fw-usb-1.5.sbcf kernel/drivers/net/wimax/i2400m/i2400m-usb.ko i915/bxt_dmc_ver1_07.bin kernel/drivers/gpu/drm/i915/i915.ko -i915/bxt_guc_32.0.3.bin kernel/drivers/gpu/drm/i915/i915.ko +i915/bxt_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko i915/bxt_huc_ver01_8_2893.bin kernel/drivers/gpu/drm/i915/i915.ko i915/cnl_dmc_ver1_07.bin kernel/drivers/gpu/drm/i915/i915.ko i915/glk_dmc_ver1_04.bin kernel/drivers/gpu/drm/i915/i915.ko -i915/glk_guc_32.0.3.bin kernel/drivers/gpu/drm/i915/i915.ko +i915/glk_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko i915/glk_huc_ver03_01_2893.bin kernel/drivers/gpu/drm/i915/i915.ko i915/icl_dmc_ver1_07.bin kernel/drivers/gpu/drm/i915/i915.ko -i915/icl_guc_32.0.3.bin kernel/drivers/gpu/drm/i915/i915.ko +i915/icl_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko i915/icl_huc_ver8_4_3238.bin kernel/drivers/gpu/drm/i915/i915.ko i915/kbl_dmc_ver1_04.bin kernel/drivers/gpu/drm/i915/i915.ko -i915/kbl_guc_32.0.3.bin kernel/drivers/gpu/drm/i915/i915.ko +i915/kbl_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko i915/kbl_huc_ver02_00_1810.bin kernel/drivers/gpu/drm/i915/i915.ko i915/skl_dmc_ver1_27.bin kernel/drivers/gpu/drm/i915/i915.ko -i915/skl_guc_32.0.3.bin kernel/drivers/gpu/drm/i915/i915.ko +i915/skl_guc_33.0.0.bin kernel/drivers/gpu/drm/i915/i915.ko i915/skl_huc_ver01_07_1398.bin kernel/drivers/gpu/drm/i915/i915.ko +i915/tgl_dmc_ver2_04.bin kernel/drivers/gpu/drm/i915/i915.ko intel/ibt-11-5.ddc kernel/drivers/bluetooth/btintel.ko intel/ibt-11-5.sfi kernel/drivers/bluetooth/btintel.ko intel/ibt-12-16.ddc kernel/drivers/bluetooth/btintel.ko intel/ibt-12-16.sfi kernel/drivers/bluetooth/btintel.ko +intel/ice/ddp/ice.pkg kernel/drivers/net/ethernet/intel/ice/ice.ko ipw2100-1.3.fw kernel/drivers/net/wireless/intel/ipw2x00/ipw2100.ko ipw2100-1.3-i.fw kernel/drivers/net/wireless/intel/ipw2x00/ipw2100.ko ipw2100-1.3-p.fw kernel/drivers/net/wireless/intel/ipw2x00/ipw2100.ko @@ -728,22 +780,21 @@ iwlwifi-8000C-36.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko iwlwifi-8265-36.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko iwlwifi-9000-pu-b0-jf-b0-46.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko iwlwifi-9260-th-b0-jf-b0-46.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-cc-a0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-Qu-a0-hr-a0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-Qu-a0-jf-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-Qu-b0-hr-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-Qu-b0-jf-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-Qu-c0-hr-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-QuQnj-a0-hr-a0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-QuQnj-b0-hr-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-QuQnj-b0-jf-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-QuQnj-f0-hr-a0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-QuZ-a0-hr-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-QuZ-a0-jf-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-so-a0-gf-a0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-so-a0-hr-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-so-a0-jf-b0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko -iwlwifi-ty-a0-gf-a0-48.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-cc-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-Qu-a0-hr-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-Qu-a0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-Qu-b0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-Qu-c0-hr-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-QuQnj-a0-hr-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-QuQnj-b0-hr-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-QuQnj-b0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-QuQnj-f0-hr-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-QuZ-a0-hr-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-QuZ-a0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-so-a0-gf-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-so-a0-hr-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-so-a0-jf-b0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko +iwlwifi-ty-a0-gf-a0-50.ucode kernel/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko kaweth/new_code.bin kernel/drivers/net/usb/kaweth.ko kaweth/new_code_fix.bin kernel/drivers/net/usb/kaweth.ko kaweth/trigger_code.bin kernel/drivers/net/usb/kaweth.ko @@ -821,7 +872,7 @@ mediatek/mt7663pr2h.bin kernel/drivers/bluetooth/btusb.ko mediatek/mt7668pr2h.bin kernel/drivers/bluetooth/btmtksdio.ko mediatek/mt7668pr2h.bin kernel/drivers/bluetooth/btmtkuart.ko mediatek/mt7668pr2h.bin kernel/drivers/bluetooth/btusb.ko -mellanox/mlxsw_spectrum-13.2000.1122.mfa2 kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko +mellanox/mlxsw_spectrum-13.2000.1886.mfa2 kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko mixart/miXart8AES.xlx kernel/sound/pci/mixart/snd-mixart.ko mixart/miXart8.elf kernel/sound/pci/mixart/snd-mixart.ko mixart/miXart8.xlx kernel/sound/pci/mixart/snd-mixart.ko @@ -878,6 +929,8 @@ myri10ge_ethp_z8e.dat kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge.ko myri10ge_eth_z8e.dat kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge.ko myri10ge_rss_ethp_z8e.dat kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge.ko myri10ge_rss_eth_z8e.dat kernel/drivers/net/ethernet/myricom/myri10ge/myri10ge.ko +netronome/nic_AMDA0058-0011_2x40.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko +netronome/nic_AMDA0058-0012_2x40.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko netronome/nic_AMDA0081-0001_1x40.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko netronome/nic_AMDA0081-0001_4x10.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko netronome/nic_AMDA0096-0001_2x10.nffw kernel/drivers/net/ethernet/netronome/nfp/nfp.ko @@ -1391,6 +1444,7 @@ rtl_nic/rtl8106e-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko rtl_nic/rtl8106e-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko rtl_nic/rtl8107e-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko rtl_nic/rtl8107e-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko +rtl_nic/rtl8125a-3.fw kernel/drivers/net/ethernet/realtek/r8169.ko rtl_nic/rtl8168d-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko rtl_nic/rtl8168d-2.fw kernel/drivers/net/ethernet/realtek/r8169.ko rtl_nic/rtl8168e-1.fw kernel/drivers/net/ethernet/realtek/r8169.ko diff --git a/patches/kernel/0006-drm-i915-Avoid-HPD-poll-detect-triggering-a-new-dete.patch b/patches/kernel/0006-drm-i915-Avoid-HPD-poll-detect-triggering-a-new-dete.patch deleted file mode 100644 index f0ef5f5..0000000 --- a/patches/kernel/0006-drm-i915-Avoid-HPD-poll-detect-triggering-a-new-dete.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Imre Deak -Date: Mon, 28 Oct 2019 20:15:17 +0200 -Subject: [PATCH] drm/i915: Avoid HPD poll detect triggering a new detect cycle -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For the HPD interrupt functionality the HW depends on power wells in the -display core domain to be on. Accordingly when enabling these power -wells the HPD polling logic will force an HPD detection cycle to account -for hotplug events that may have happened when such a power well was -off. - -Thus a detect cycle started by polling could start a new detect cycle if -a power well in the display core domain gets enabled during detect and -stays enabled after detect completes. That in turn can lead to a -detection cycle runaway. - -To prevent re-triggering a poll-detect cycle make sure we drop all power -references we acquired during detect synchronously by the end of detect. -This will let the poll-detect logic continue with polling (matching the -off state of the corresponding power wells) instead of scheduling a new -detection cycle. - -Fixes: 6cfe7ec02e85 ("drm/i915: Remove the unneeded AUX power ref from intel_dp_detect()") -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112125 -Reported-and-tested-by: Val Kulkov -Reported-and-tested-by: wangqr -Cc: Val Kulkov -Cc: wangqr -Cc: Ville Syrjälä -Signed-off-by: Imre Deak -Reviewed-by: Ville Syrjälä -Link: https://patchwork.freedesktop.org/patch/msgid/20191028181517.22602-1-imre.deak@intel.com -(cherry picked from commit a8ddac7c9f06a12227a4f5febd1cbe0575a33179) -Signed-off-by: Thomas Lamprecht ---- - drivers/gpu/drm/i915/display/intel_crt.c | 7 +++++++ - drivers/gpu/drm/i915/display/intel_dp.c | 6 ++++++ - drivers/gpu/drm/i915/display/intel_hdmi.c | 6 ++++++ - 3 files changed, 19 insertions(+) - -diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c -index 3fcf2f84bcce..da1d6be46a0c 100644 ---- a/drivers/gpu/drm/i915/display/intel_crt.c -+++ b/drivers/gpu/drm/i915/display/intel_crt.c -@@ -867,6 +867,13 @@ intel_crt_detect(struct drm_connector *connector, - - out: - intel_display_power_put(dev_priv, intel_encoder->power_domain, wakeref); -+ -+ /* -+ * Make sure the refs for power wells enabled during detect are -+ * dropped to avoid a new detect cycle triggered by HPD polling. -+ */ -+ intel_display_power_flush_work(dev_priv); -+ - return status; - } - -diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c -index 305abddc274a..dbdd46ba9bfe 100644 ---- a/drivers/gpu/drm/i915/display/intel_dp.c -+++ b/drivers/gpu/drm/i915/display/intel_dp.c -@@ -5649,6 +5649,12 @@ intel_dp_detect(struct drm_connector *connector, - if (status != connector_status_connected && !intel_dp->is_mst) - intel_dp_unset_edid(intel_dp); - -+ /* -+ * Make sure the refs for power wells enabled during detect are -+ * dropped to avoid a new detect cycle triggered by HPD polling. -+ */ -+ intel_display_power_flush_work(dev_priv); -+ - return status; - } - -diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c -index 7ffdfaae7188..5d5453461a6f 100644 ---- a/drivers/gpu/drm/i915/display/intel_hdmi.c -+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c -@@ -2571,6 +2571,12 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) - if (status != connector_status_connected) - cec_notifier_phys_addr_invalidate(intel_hdmi->cec_notifier); - -+ /* -+ * Make sure the refs for power wells enabled during detect are -+ * dropped to avoid a new detect cycle triggered by HPD polling. -+ */ -+ intel_display_power_flush_work(dev_priv); -+ - return status; - } - diff --git a/submodules/ubuntu-eoan b/submodules/ubuntu-eoan deleted file mode 160000 index 30276f7..0000000 --- a/submodules/ubuntu-eoan +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 30276f78d6d968d1c7035bf0b175d5520fa580da diff --git a/submodules/ubuntu-focal b/submodules/ubuntu-focal new file mode 160000 index 0000000..f8a0e63 --- /dev/null +++ b/submodules/ubuntu-focal @@ -0,0 +1 @@ +Subproject commit f8a0e63a9ba99fa0606bc8153fc9cec6ab5c931f