kernel 6.0.9

2 files changed, 10 insertions, 87 deletions

diff --git a/SOURCES/patch-6.0-redhat.patch b/SOURCES/patch-6.0-redhat.patch
index bc9df70..b639b5a 100644
--- a/SOURCES/patch-6.0-redhat.patch
+++ b/SOURCES/patch-6.0-redhat.patch
@@ -16,8 +16,6 @@
  drivers/firmware/efi/secureboot.c                  |  38 +++
  drivers/firmware/sysfb.c                           |  18 +-
  drivers/gpu/drm/tiny/simpledrm.c                   |  65 ++++-
- drivers/gpu/drm/vc4/vc4_hdmi.c                     |  21 +-
- drivers/gpu/drm/vc4/vc4_hdmi.h                     |   1 +
  drivers/hid/hid-rmi.c                              |  64 -----
  drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++
  drivers/input/rmi4/rmi_driver.c                    | 124 +++++----
@@ -47,10 +45,10 @@
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
  tools/testing/selftests/net/fib_nexthops.sh        |   5 +
- 49 files changed, 780 insertions(+), 366 deletions(-)
+ 47 files changed, 762 insertions(+), 362 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index bcb76d4fdbc1..504aa3071925 100644
+index a234f16783ed..4cf0f80ced16 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -706,84 +704,6 @@ index 5422363690e7..a5b500811892 100644
  		sdev->nformats++;
  	}
 
-diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 874c6bd787c5..4e5bba0822a5 100644
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2712,9 +2712,16 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
- 		DRM_ERROR("Failed to get HDMI state machine clock\n");
- 		return PTR_ERR(vc4_hdmi->hsm_clock);
- 	}
-+
- 	vc4_hdmi->audio_clock = vc4_hdmi->hsm_clock;
- 	vc4_hdmi->cec_clock = vc4_hdmi->hsm_clock;
-
-+	vc4_hdmi->hsm_rpm_clock = devm_clk_get(dev, "hdmi");
-+	if (IS_ERR(vc4_hdmi->hsm_rpm_clock)) {
-+		DRM_ERROR("Failed to get HDMI state machine clock\n");
-+		return PTR_ERR(vc4_hdmi->hsm_rpm_clock);
-+	}
-+
- 	return 0;
- }
-
-@@ -2796,6 +2803,12 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
- 		return PTR_ERR(vc4_hdmi->hsm_clock);
- 	}
-
-+	vc4_hdmi->hsm_rpm_clock = devm_clk_get(dev, "hdmi");
-+	if (IS_ERR(vc4_hdmi->hsm_rpm_clock)) {
-+		DRM_ERROR("Failed to get HDMI state machine clock\n");
-+		return PTR_ERR(vc4_hdmi->hsm_rpm_clock);
-+	}
-+
- 	vc4_hdmi->pixel_bvb_clock = devm_clk_get(dev, "bvb");
- 	if (IS_ERR(vc4_hdmi->pixel_bvb_clock)) {
- 		DRM_ERROR("Failed to get pixel bvb clock\n");
-@@ -2859,7 +2872,7 @@ static int vc4_hdmi_runtime_suspend(struct device *dev)
- {
- 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
-
--	clk_disable_unprepare(vc4_hdmi->hsm_clock);
-+	clk_disable_unprepare(vc4_hdmi->hsm_rpm_clock);
-
- 	return 0;
- }
-@@ -2877,11 +2890,11 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
- 	 * its frequency while the power domain is active so that it
- 	 * keeps its rate.
- 	 */
--	ret = clk_set_min_rate(vc4_hdmi->hsm_clock, HSM_MIN_CLOCK_FREQ);
-+	ret = clk_set_min_rate(vc4_hdmi->hsm_rpm_clock, HSM_MIN_CLOCK_FREQ);
- 	if (ret)
- 		return ret;
-
--	ret = clk_prepare_enable(vc4_hdmi->hsm_clock);
-+	ret = clk_prepare_enable(vc4_hdmi->hsm_rpm_clock);
- 	if (ret)
- 		return ret;
-
-@@ -2894,7 +2907,7 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
- 	 * case, it will lead to a silent CPU stall. Let's make sure we
- 	 * prevent such a case.
- 	 */
--	rate = clk_get_rate(vc4_hdmi->hsm_clock);
-+	rate = clk_get_rate(vc4_hdmi->hsm_rpm_clock);
- 	if (!rate) {
- 		ret = -EINVAL;
- 		goto err_disable_clk;
-diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index c3ed2b07df23..47f141ec8c40 100644
---- a/drivers/gpu/drm/vc4/vc4_hdmi.h
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
-@@ -171,6 +171,7 @@ struct vc4_hdmi {
- 	struct clk *cec_clock;
- 	struct clk *pixel_clock;
- 	struct clk *hsm_clock;
-+	struct clk *hsm_rpm_clock;
- 	struct clk *audio_clock;
- 	struct clk *pixel_bvb_clock;
-
 diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c
 index 311eee599ce9..2460c6bd46f8 100644
 --- a/drivers/hid/hid-rmi.c
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 85e90fe..633b810 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -122,17 +122,17 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 %define buildid .fsync
-%define specversion 6.0.8
+%define specversion 6.0.9
 %define patchversion 6.0
 %define pkgrelease 300
 %define kversion 6
-%define tarfile_release 6.0.8
+%define tarfile_release 6.0.9
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 301%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.0.8
+%define kabiversion 6.0.9
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3221,8 +3221,11 @@ fi
 #
 #
 %changelog
-* Tue Nov 15 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 6.0.8-301.fsync
-- kernel-fsync v6.0.8
+* Wed Nov 23 2022 Jan Drögehoff <sentrycraft123@gmail.com> - 6.0.9-301.fsync
+- kernel-fsync v6.0.9
+
+* Wed Nov 16 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.9-0]
+- Linux v6.0.9
 
 * Fri Nov 11 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.8-0]
 - PCI/PM: Always disable PTM for all devices during suspend (Mark Pearson)