[rocky8_10] History Rebuild 4.18.0-553.33.1

Makefile.rhelver

@@ -12,7 +12,7 @@ RHEL_MINOR = 10
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 553.32.1
+RHEL_RELEASE = 553.33.1
 
 #
 # ZSTREAM

ciq/ciq_backports/kernel-4.18.0-553.33.1.el8_10/50452f2f.failed

@@ -0,0 +1,55 @@
+drm/i915: Fix HPD polling, reenabling the output poll work as needed
+
+jira LE-2183
+Rebuild_History Non-Buildable kernel-4.18.0-553.33.1.el8_10
+commit-author Imre Deak <[email protected]>
+commit 50452f2f76852322620b63e62922b85e955abe94
+Empty-Commit: Cherry-Pick Conflicts during history rebuild.
+Will be included in final tarball splat. Ref for failed cherry-pick at:
+ciq/ciq_backports/kernel-4.18.0-553.33.1.el8_10/50452f2f.failed
+
+After the commit in the Fixes: line below, HPD polling stopped working
+on i915, since after that change calling drm_kms_helper_poll_enable()
+doesn't restart drm_mode_config::output_poll_work if the work was
+stopped (no connectors needing polling) and enabling polling for a
+connector (during runtime suspend or detecting an HPD IRQ storm).
+
+After the above change calling drm_kms_helper_poll_enable() is a nop
+after it's been called already and polling for some connectors was
+disabled/re-enabled.
+
+Fix this by calling drm_kms_helper_poll_reschedule() added in the
+previous patch instead, which reschedules the work whenever expected.
+
+Fixes: d33a54e3991d ("drm/probe_helper: sort out poll_running vs poll_enabled")
+CC: [email protected] # 6.4+
+	Cc: Dmitry Baryshkov <[email protected]>
+	Cc: [email protected]
+	Reviewed-by: Jouni Högander <[email protected]>
+	Signed-off-by: Imre Deak <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 50452f2f76852322620b63e62922b85e955abe94)
+	Signed-off-by: Jonathan Maple <[email protected]>
+
+# Conflicts:
+#	drivers/gpu/drm/i915/display/intel_hotplug.c
+diff --cc drivers/gpu/drm/i915/display/intel_hotplug.c
+index 907ab7526cb4,e8562f6f8bb4..000000000000
+--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
++++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
+@@@ -210,8 -212,9 +210,14 @@@ intel_hpd_irq_storm_switch_to_polling(s
+
+  	/* Enable polling and queue hotplug re-enabling. */
+  	if (hpd_disabled) {
+++<<<<<<< HEAD
+ +		drm_kms_helper_poll_enable(&dev_priv->drm);
+ +		mod_delayed_work(system_wq, &dev_priv->display.hotplug.reenable_work,
+++=======
++ 		drm_kms_helper_poll_reschedule(&dev_priv->drm);
++ 		mod_delayed_work(dev_priv->unordered_wq,
++ 				 &dev_priv->display.hotplug.reenable_work,
+++>>>>>>> 50452f2f7685 (drm/i915: Fix HPD polling, reenabling the output poll work as needed)
+  				 msecs_to_jiffies(HPD_STORM_REENABLE_DELAY));
+  	}
+  }
+* Unmerged path drivers/gpu/drm/i915/display/intel_hotplug.c

ciq/ciq_backports/kernel-4.18.0-553.33.1.el8_10/rebuild.details.txt

@@ -0,0 +1,24 @@
+Rebuild_History BUILDABLE
+Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
+Number of commits in upstream range v4.18~1..master: 488125
+Number of commits in rpm: 9
+Number of commits matched with upstream: 2 (22.22%)
+Number of commits in upstream but not in rpm: 488123
+Number of commits NOT found in upstream: 7 (77.78%)
+
+Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.33.1.el8_10 for kernel-4.18.0-553.33.1.el8_10
+Clean Cherry Picks: 1 (50.00%)
+Empty Cherry Picks: 1 (50.00%)
+_______________________________
+
+__EMPTY COMMITS__________________________
+50452f2f76852322620b63e62922b85e955abe94 drm/i915: Fix HPD polling, reenabling the output poll work as needed
+
+__CHANGES NOT IN UPSTREAM________________
+Adding prod certs and changed cert date to 20210620
+Adding Rocky secure boot certs
+Fixing vmlinuz removal
+Fixing UEFI CA path
+Porting to 8.10, debranding and Rocky branding
+Fixing pesign_key_name values
+Revert "scsi: lpfc: Fix mbuf pool resource detected as busy at driver unload" This patch is dependent on the mbox refactor patch that was not added to rh8.