From ef821c80277392ef90def6373d7fdcae93c27547 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Mon, 1 Mar 2021 20:44:55 +0100 Subject: kernel 5.10.19 --- SOURCES/bluetooth-btusb-qca-fix.patch | 51 ------------- SOURCES/i915-fixes.patch | 134 ++++++++++++++++++++++++++++++++++ SPECS/kernel.spec | 16 ++-- 3 files changed, 145 insertions(+), 56 deletions(-) delete mode 100644 SOURCES/bluetooth-btusb-qca-fix.patch create mode 100644 SOURCES/i915-fixes.patch diff --git a/SOURCES/bluetooth-btusb-qca-fix.patch b/SOURCES/bluetooth-btusb-qca-fix.patch deleted file mode 100644 index d770639..0000000 --- a/SOURCES/bluetooth-btusb-qca-fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 28ddef379ecc0ab1ae646f6442cfa839ab9a15b2 Mon Sep 17 00:00:00 2001 -From: Hui Wang -Date: Mon, 8 Feb 2021 13:02:37 +0800 -Subject: [PATCH 5.12 regression fix] Bluetooth: btusb: Some Qualcomm Bluetooth - adapters stop working - -This issue starts from linux-5.10-rc1, I reproduced this issue on my -Dell Inspiron 7447 with BT adapter 0cf3:e005, the kernel will print -out: "Bluetooth: hci0: don't support firmware rome 0x31010000", and -someone else also reported the similar issue to bugzilla #211571. - -I found this is a regression introduced by 'commit b40f58b97386 -("Bluetooth: btusb: Add Qualcomm Bluetooth SoC WCN6855 support"), the -patch assumed that if high ROM version is not zero, it is an adapter -on WCN6855, but many old adapters don't need to load rampatch or nvm, -and they have non-zero high ROM version. - -To fix it, let the driver match the rom_version in the -qca_devices_table first, if there is no entry matched, check the -high ROM version, if it is not zero, we assume this adapter is ready -to work and no need to load rampatch and nvm like previously. - -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=211571 -Fixes: b40f58b97386 ("Bluetooth: btusb: Add Qualcomm Bluetooth SoC WCN6855 support") -Signed-off-by: Hui Wang -Signed-off-by: Marcel Holtmann ---- - drivers/bluetooth/btusb.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 80468745d5c5..1c128de99abd 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -3693,6 +3693,13 @@ static int btusb_setup_qca(struct hci_dev *hdev) - info = &qca_devices_table[i]; - } - if (!info) { -+ /* If the rom_version is not matched in the qca_devices_table -+ * and the high ROM version is not zero, we assume this chip no -+ * need to load the rampatch and nvm. -+ */ -+ if (ver_rom & ~0xffffU) -+ return 0; -+ - bt_dev_err(hdev, "don't support firmware rome 0x%x", ver_rom); - return -ENODEV; - } --- -2.30.1 - diff --git a/SOURCES/i915-fixes.patch b/SOURCES/i915-fixes.patch new file mode 100644 index 0000000..fab7711 --- /dev/null +++ b/SOURCES/i915-fixes.patch @@ -0,0 +1,134 @@ +From 660fd7a8af42f8715dc6784a2d1d2fe42dc5a72f Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Tue, 19 Jan 2021 11:07:57 +0000 +Subject: [PATCH 1/3] drm/i915/gt: One more flush for Baytrail clear residuals + +CI reports that Baytail requires one more invalidate after CACHE_MODE +for it to be happy. + +Fixes: ace44e13e577 ("drm/i915/gt: Clear CACHE_MODE prior to clearing residuals") +Signed-off-by: Chris Wilson +Cc: Mika Kuoppala +Cc: Akeem G Abodunrin +Reviewed-by: Mika Kuoppala +Reviewed-by: Akeem G Abodunrin +Link: https://patchwork.freedesktop.org/patch/msgid/20210119110802.22228-1-chris@chris-wilson.co.uk +--- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/i915/gt/gen7_renderclear.c b/drivers/gpu/drm/i915/gt/gen7_renderclear.c +index e961ad6a3129..c50b18dd67be 100644 +--- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c ++++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c +@@ -353,19 +353,21 @@ static void gen7_emit_pipeline_flush(struct batch_chunk *batch) + + static void gen7_emit_pipeline_invalidate(struct batch_chunk *batch) + { +- u32 *cs = batch_alloc_items(batch, 0, 8); ++ u32 *cs = batch_alloc_items(batch, 0, 10); + + /* ivb: Stall before STATE_CACHE_INVALIDATE */ +- *cs++ = GFX_OP_PIPE_CONTROL(4); ++ *cs++ = GFX_OP_PIPE_CONTROL(5); + *cs++ = PIPE_CONTROL_STALL_AT_SCOREBOARD | + PIPE_CONTROL_CS_STALL; + *cs++ = 0; + *cs++ = 0; ++ *cs++ = 0; + +- *cs++ = GFX_OP_PIPE_CONTROL(4); ++ *cs++ = GFX_OP_PIPE_CONTROL(5); + *cs++ = PIPE_CONTROL_STATE_CACHE_INVALIDATE; + *cs++ = 0; + *cs++ = 0; ++ *cs++ = 0; + + batch_advance(batch, cs); + } +@@ -397,6 +399,7 @@ static void emit_batch(struct i915_vma * const vma, + batch_add(&cmds, 0xffff0000); + batch_add(&cmds, i915_mmio_reg_offset(CACHE_MODE_1)); + batch_add(&cmds, 0xffff0000 | PIXEL_SUBSPAN_COLLECT_OPT_DISABLE); ++ gen7_emit_pipeline_invalidate(&cmds); + gen7_emit_pipeline_flush(&cmds); + + /* Switch to the media pipeline and our base address */ +-- +2.30.1 + +From b3d131f8d2b9055052b6e072b57fa390b7275443 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Mon, 25 Jan 2021 22:02:47 +0000 +Subject: [PATCH 2/3] drm/i915/gt: Flush before changing register state + +Flush; invalidate; change registers; invalidate; flush. + +Will this finally work on every device? Or will Baytrail complain again? + +On the positive side, we immediately see the benefit of having hsw-gt1 in +CI. + +Fixes: ace44e13e577 ("drm/i915/gt: Clear CACHE_MODE prior to clearing residuals") +Testcase: igt/gem_render_tiled_blits # hsw-gt1 +Signed-off-by: Chris Wilson +Cc: Mika Kuoppala +Cc: Akeem G Abodunrin +Acked-by: Mika Kuoppala +Link: https://patchwork.freedesktop.org/patch/msgid/20210125220247.31701-1-chris@chris-wilson.co.uk +--- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/i915/gt/gen7_renderclear.c b/drivers/gpu/drm/i915/gt/gen7_renderclear.c +index c50b18dd67be..e53b409012c0 100644 +--- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c ++++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c +@@ -393,6 +393,7 @@ static void emit_batch(struct i915_vma * const vma, + desc_count); + + /* Reset inherited context registers */ ++ gen7_emit_pipeline_flush(&cmds); + gen7_emit_pipeline_invalidate(&cmds); + batch_add(&cmds, MI_LOAD_REGISTER_IMM(2)); + batch_add(&cmds, i915_mmio_reg_offset(CACHE_MODE_0_GEN7)); +-- +2.30.1 + +From 28f4f465f21f9dc267ce08833b8e79356cbc05f3 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 10 Feb 2021 12:27:28 +0000 +Subject: [PATCH 3/3] drm/i915/gt: Correct surface base address for renderclear + +The surface_state_base is an offset into the batch, so we need to pass +the correct batch address for STATE_BASE_ADDRESS. + +Fixes: 47f8253d2b89 ("drm/i915/gen7: Clear all EU/L3 residual contexts") +Signed-off-by: Chris Wilson +Cc: Mika Kuoppala +Cc: Prathap Kumar Valsan +Cc: Akeem G Abodunrin +Cc: Hans de Goede +Reviewed-by: Mika Kuoppala +Cc: # v5.7+ +Link: https://patchwork.freedesktop.org/patch/msgid/20210210122728.20097-1-chris@chris-wilson.co.uk +--- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/i915/gt/gen7_renderclear.c b/drivers/gpu/drm/i915/gt/gen7_renderclear.c +index e53b409012c0..4adbc2bba97f 100644 +--- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c ++++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c +@@ -240,7 +240,7 @@ gen7_emit_state_base_address(struct batch_chunk *batch, + /* general */ + *cs++ = batch_addr(batch) | BASE_ADDRESS_MODIFY; + /* surface */ +- *cs++ = batch_addr(batch) | surface_state_base | BASE_ADDRESS_MODIFY; ++ *cs++ = (batch_addr(batch) + surface_state_base) | BASE_ADDRESS_MODIFY; + /* dynamic */ + *cs++ = batch_addr(batch) | BASE_ADDRESS_MODIFY; + /* indirect */ +-- +2.30.1 + diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index ca7ea45..e2323c9 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -94,7 +94,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 18 +%define stable_update 19 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -857,8 +857,8 @@ Patch107: 0001-drm-nouveau-kms-handle-mDP-connectors.patch Patch109: 0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch -# rhbz 1916104 (patch from bluetooth-next) -Patch110: bluetooth-btusb-qca-fix.patch +# rhbz 1925346 +Patch111: i915-fixes.patch # linux-fsync patches Patch200: zen.patch @@ -2977,8 +2977,14 @@ fi # # %changelog -* Sat Feb 27 2021 Jan Drögehoff - 5.10.18-201.fsync -- Linux v5.10.18 futex2 zen +* Mon Mar 01 2021 Jan Drögehoff - 5.10.19-201 +- Linux v5.10.19 futex2 zen + +* Fri Feb 26 2021 Justin M. Forbes - 5.10.19-200 +- Linux v5.10.19 + +* Thu Feb 25 2021 Justin M. Forbes +- Some i915 fixes for 5.10 (rhbz 1925346) * Tue Feb 23 2021 Justin M. Forbes - 5.10.18-200 - Linux v5.10.18 -- cgit v1.2.3