core/linux-raspberrypi4 to 5.10.44-3

Add HVS core clock request fix/tested with kodi and sddm on aarch64

core/linux-raspberrypi4/0002-Revert-drm-Introduce-new-state-accessors-in-place-of.patch

@@ -1,155 +0,0 @@
-From f9943ea0495df0097e6be6f254158aa0ffa6ff54 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Mon, 21 Jun 2021 10:59:58 -0400
-Subject: [PATCH 1/3] Revert "drm: Introduce new state accessors in place of
- drm_atomic_get_crtc_state"
-
-This reverts commit 040d0dd82dbfad11984b696e35beb56906f8f4a7.
----
- drivers/gpu/drm/drm_atomic.c | 104 -----------------------------------
- include/drm/drm_atomic.h     |   7 ---
- 2 files changed, 111 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
-index 22a97d786d58..58527f151984 100644
---- a/drivers/gpu/drm/drm_atomic.c
-+++ b/drivers/gpu/drm/drm_atomic.c
-@@ -281,10 +281,6 @@ EXPORT_SYMBOL(__drm_atomic_state_free);
-  * needed. It will also grab the relevant CRTC lock to make sure that the state
-  * is consistent.
-  *
-- * This function is deprecated,
-- * @drm_atomic_get_old_or_current_crtc_state or
-- * @drm_atomic_get_new_or_current_crtc_state should be used instead.
-- *
-  * Returns:
-  *
-  * Either the allocated state or the error code encoded into the pointer. When
-@@ -325,106 +321,6 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state,
- }
- EXPORT_SYMBOL(drm_atomic_get_crtc_state);
- 
--/**
-- * drm_atomic_get_old_or_current_crtc_state - get CRTC state
-- * @state: global atomic state object
-- * @crtc: CRTC to get state object for
-- *
-- * This function returns the old CRTC state for the given CRTC if it's
-- * part of the state, or allocating a copy of the current state
-- * otherwise. It will also grab the relevant CRTC lock to make sure that
-- * the state is consistent.
-- *
-- * Returns:
-- *
-- * Either the allocated state or the error code encoded into the pointer. When
-- * the error is EDEADLK then the w/w mutex code has detected a deadlock and the
-- * entire atomic sequence must be restarted. All other errors are fatal.
-- */
--struct drm_crtc_state *
--drm_atomic_get_old_or_current_crtc_state(struct drm_atomic_state *state,
--					 struct drm_crtc *crtc)
--{
--	int ret, index = drm_crtc_index(crtc);
--	struct drm_crtc_state *crtc_state;
--
--	WARN_ON(!state->acquire_ctx);
--
--	crtc_state = drm_atomic_get_old_crtc_state(state, crtc);
--	if (crtc_state)
--		return crtc_state;
--
--	ret = drm_modeset_lock(&crtc->mutex, state->acquire_ctx);
--	if (ret)
--		return ERR_PTR(ret);
--
--	crtc_state = crtc->funcs->atomic_duplicate_state(crtc);
--	if (!crtc_state)
--		return ERR_PTR(-ENOMEM);
--
--	state->crtcs[index].state = crtc_state;
--	state->crtcs[index].old_state = crtc->state;
--	state->crtcs[index].new_state = crtc_state;
--	state->crtcs[index].ptr = crtc;
--	crtc_state->state = state;
--
--	DRM_DEBUG_ATOMIC("Added [CRTC:%d:%s] %p state to %p\n",
--			 crtc->base.id, crtc->name, crtc_state, state);
--
--	return crtc_state;
--}
--EXPORT_SYMBOL(drm_atomic_get_old_or_current_crtc_state);
--
--/**
-- * drm_atomic_get_new_or_current_crtc_state - get CRTC state
-- * @state: global atomic state object
-- * @crtc: CRTC to get state object for
-- *
-- * This function returns the new CRTC state for the given CRTC if it's
-- * part of the state, or allocating a copy of the current state
-- * otherwise. It will also grab the relevant CRTC lock to make sure that
-- * the state is consistent.
-- *
-- * Returns:
-- *
-- * Either the allocated state or the error code encoded into the pointer. When
-- * the error is EDEADLK then the w/w mutex code has detected a deadlock and the
-- * entire atomic sequence must be restarted. All other errors are fatal.
-- */
--struct drm_crtc_state *
--drm_atomic_get_new_or_current_crtc_state(struct drm_atomic_state *state,
--					 struct drm_crtc *crtc)
--{
--	int ret, index = drm_crtc_index(crtc);
--	struct drm_crtc_state *crtc_state;
--
--	WARN_ON(!state->acquire_ctx);
--
--	crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
--	if (crtc_state)
--		return crtc_state;
--
--	ret = drm_modeset_lock(&crtc->mutex, state->acquire_ctx);
--	if (ret)
--		return ERR_PTR(ret);
--
--	crtc_state = crtc->funcs->atomic_duplicate_state(crtc);
--	if (!crtc_state)
--		return ERR_PTR(-ENOMEM);
--
--	state->crtcs[index].state = crtc_state;
--	state->crtcs[index].old_state = crtc->state;
--	state->crtcs[index].new_state = crtc_state;
--	state->crtcs[index].ptr = crtc;
--	crtc_state->state = state;
--
--	DRM_DEBUG_ATOMIC("Added [CRTC:%d:%s] %p state to %p\n",
--			 crtc->base.id, crtc->name, crtc_state, state);
--
--	return crtc_state;
--}
--EXPORT_SYMBOL(drm_atomic_get_new_or_current_crtc_state);
--
- static int drm_atomic_crtc_check(const struct drm_crtc_state *old_crtc_state,
- 				 const struct drm_crtc_state *new_crtc_state)
- {
-diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h
-index feec1676fc03..d07c851d255b 100644
---- a/include/drm/drm_atomic.h
-+++ b/include/drm/drm_atomic.h
-@@ -445,13 +445,6 @@ void drm_atomic_state_default_release(struct drm_atomic_state *state);
- struct drm_crtc_state * __must_check
- drm_atomic_get_crtc_state(struct drm_atomic_state *state,
- 			  struct drm_crtc *crtc);
--struct drm_crtc_state * __must_check
--drm_atomic_get_new_or_current_crtc_state(struct drm_atomic_state *state,
--					 struct drm_crtc *crtc);
--struct drm_crtc_state * __must_check
--drm_atomic_get_old_or_current_crtc_state(struct drm_atomic_state *state,
--					 struct drm_crtc *crtc);
--
- struct drm_plane_state * __must_check
- drm_atomic_get_plane_state(struct drm_atomic_state *state,
- 			   struct drm_plane *plane);
--- 
-2.32.0
-

core/linux-raspberrypi4/0003-Revert-drm-vc4-Make-vc4_crtc_get_encoder-public.patch

@@ -1,49 +0,0 @@
-From 2589982b9f08efd9189e99e38a6f4b5513f5939a Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Mon, 21 Jun 2021 11:00:12 -0400
-Subject: [PATCH 2/3] Revert "drm/vc4: Make vc4_crtc_get_encoder public"
-
-This reverts commit c83ce1fc7f167297c3ec32b14134fcc61e16e8df.
----
- drivers/gpu/drm/vc4/vc4_crtc.c | 8 ++++----
- drivers/gpu/drm/vc4/vc4_drv.h  | 5 -----
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index cea2cb87973c..a0b5503928df 100644
---- a/drivers/gpu/drm/vc4/vc4_crtc.c
-+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
-@@ -279,10 +279,10 @@ static u32 vc4_crtc_get_fifo_full_level_bits(struct vc4_crtc *vc4_crtc,
-  * allows drivers to push pixels to more than one encoder from the
-  * same CRTC.
-  */
--struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
--					 struct drm_atomic_state *state,
--					 struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
--										  struct drm_connector *connector))
-+static struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
-+						struct drm_atomic_state *state,
-+						struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
-+											 struct drm_connector *connector))
- {
- 	struct drm_connector *connector;
- 	struct drm_connector_list_iter conn_iter;
-diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 4cb0d95c1b7b..9a00e14c7615 100644
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -523,11 +523,6 @@ vc4_crtc_to_vc4_pv_data(const struct vc4_crtc *crtc)
- 	return container_of(data, struct vc4_pv_data, base);
- }
- 
--struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc,
--					 struct drm_atomic_state *state,
--					 struct drm_connector_state *(*get_state)(struct drm_atomic_state *state,
--										  struct drm_connector *connector));
--
- struct vc4_crtc_state {
- 	struct drm_crtc_state base;
- 	/* Dlist area for this CRTC configuration. */
--- 
-2.32.0
-

core/linux-raspberrypi4/0004-Revert-drm-vc4-Increase-the-core-clock-based-on-HVS-.patch

@@ -1,182 +0,0 @@
-From 8759c32bac99c890da8c5b5ac92f198dadb5b9c2 Mon Sep 17 00:00:00 2001
-From: graysky <graysky@archlinux.us>
-Date: Mon, 21 Jun 2021 11:00:43 -0400
-Subject: [PATCH 3/3] Revert "drm/vc4: Increase the core clock based on HVS
- load"
-
-This reverts commit 1c3834201272ba6ae214af5f57acf0ece55142a5.
----
- drivers/gpu/drm/vc4/vc4_drv.h |   1 -
- drivers/gpu/drm/vc4/vc4_kms.c | 127 +---------------------------------
- 2 files changed, 2 insertions(+), 126 deletions(-)
-
-diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 9a00e14c7615..7a70838595b2 100644
---- a/drivers/gpu/drm/vc4/vc4_drv.h
-+++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -329,7 +329,6 @@ struct vc4_hvs {
- 	u32 __iomem *dlist;
- 
- 	struct clk *core_clk;
--	struct clk_request *core_req;
- 
- 	/* Memory manager for CRTCs to allocate space in the display
- 	 * list.  Units are dwords.
-diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 962d3f4397ae..48e3dc11c493 100644
---- a/drivers/gpu/drm/vc4/vc4_kms.c
-+++ b/drivers/gpu/drm/vc4/vc4_kms.c
-@@ -305,106 +305,6 @@ static void vc5_hvs_pv_muxing_commit(struct vc4_dev *vc4,
- 	}
- }
- 
--#define HVS_BUS_WIDTH	4
--
--/*
-- * On the BCM2711, the core clock needs to be raised depending on the
-- * rate of pixels being fetched from memory by the HVS and then the
-- * pixels being output to the PixelValves.
-- *
-- * Thus, we need to consider the mode on each CRTC to compute the output
-- * pixel rate, and all the planes attached to those CRTCs to compute the
-- * input rate, and take the highest of the two.
-- */
--static unsigned long vc5_hvs_compute_core_rate(struct vc4_dev *vc4,
--					       struct drm_atomic_state *state)
--{
--	struct drm_crtc *crtc;
--	unsigned long cob_rate = 0;
--	unsigned long pixel_rate = 0;
--	unsigned num_outputs = 0;
--
--	drm_for_each_crtc(crtc, state->dev) {
--		const struct drm_display_mode *mode;
--		struct drm_crtc_state *crtc_state;
--		struct vc4_encoder *vc4_encoder;
--		struct drm_encoder *encoder;
--		struct drm_plane *plane;
--		unsigned long min_rate;
--		unsigned refresh;
--
--		crtc_state = drm_atomic_get_new_or_current_crtc_state(state, crtc);
--		if (!crtc_state)
--			continue;
--
--		if (!crtc_state->active)
--			continue;
--
--		mode = &crtc_state->adjusted_mode;
--		encoder = vc4_get_crtc_encoder(crtc, state,
--					       drm_atomic_get_connector_state);
--		if (!encoder)
--			continue;
--
--		num_outputs++;
--		vc4_encoder = to_vc4_encoder(encoder);
--
--		/*
--		 * The HVS only generates the active pixels and stores
--		 * completed lines in the COB. However, pixel-valve
--		 * consumes at the HDMI pixel clock rate which can be a
--		 * lot higher than the number of active pixels e.g. 4K
--		 * p60 is 594 MHz but active pixels would be 498 MHz.
--		 * The COB output is one pixel per clock and runs of the
--		 * the core clock and needs to run fast enough to send
--		 * the active pixels minus the buffering in pixel-valve.
--		 *
--		 * For PV2 (HDMI0) there are 512 pixels and for PV4
--		 * (HDMI1) there are 58. This means that for HDMI1 the
--		 * core-clock needs to be the same as the pixel clock
--		 * but for HDMI0 the core-clock can be a bit slower -
--		 * experiments suggest that 90% is about right so long
--		 * as the horizontal blanking period is at least 10% of
--		 * the total horizonal time, this isn't always in the
--		 * case.
--		 */
--		if (vc4_encoder->type == VC4_ENCODER_TYPE_HDMI0) {
--			min_rate = max(mode->clock * mode->hdisplay / mode->htotal + 1000,
--				       mode->clock * 9 / 10) * 1000;
--		} else {
--			min_rate = mode->clock * 1000;
--		}
--		cob_rate = max(cob_rate, min_rate);
--
--		refresh = drm_mode_vrefresh(mode);
--		drm_for_each_plane_mask(plane, state->dev, crtc_state->plane_mask) {
--			struct drm_plane_state *plane_state =
--				drm_atomic_get_plane_state(state, plane);
--			unsigned height, width;
--
--			if (!plane_state->fb)
--				continue;
--
--			height = plane_state->src_h >> 16;
--			width = plane_state->src_w >> 16;
--
--			pixel_rate += height * width * refresh;
--		}
--	}
--
--	/*
--	 * We need to target a memory bus load of 60% if we have a
--	 * single HVS channel enabled, and 40% otherwise.
--	 */
--	if (num_outputs > 1)
--		pixel_rate = pixel_rate / 40;
--	else
--		pixel_rate = pixel_rate / 60;
--	pixel_rate = pixel_rate * 100;
--
--	return max(cob_rate, pixel_rate / HVS_BUS_WIDTH);
--}
--
- static void
- vc4_atomic_complete_commit(struct drm_atomic_state *state)
- {
-@@ -426,20 +326,9 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)
- 		vc4_hvs_mask_underrun(dev, vc4_crtc_state->assigned_channel);
- 	}
- 
--	if (vc4->hvs && vc4->hvs->hvs5) {
--		/*
--		 * Do a temporary request on the core clock during the
--		 * modeset.
--		 */
-+	if (vc4->hvs && vc4->hvs->hvs5)
- 		core_req = clk_request_start(hvs->core_clk, 500000000);
- 
--		/*
--		 * And remove the previous one based on the HVS
--		 * requirements if any.
--		 */
--		clk_request_done(hvs->core_req);
--	}
--
- 	drm_atomic_helper_wait_for_fences(dev, state, false);
- 
- 	drm_atomic_helper_wait_for_dependencies(state);
-@@ -469,20 +358,8 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)
- 
- 	drm_atomic_helper_commit_cleanup_done(state);
- 
--	if (vc4->hvs && vc4->hvs->hvs5) {
--		unsigned long core_rate = vc5_hvs_compute_core_rate(vc4,
--								    state);
--
--		/*
--		 * Request a clock rate based on the current HVS
--		 * requirements.
--		 */
--		hvs->core_req = clk_request_start(hvs->core_clk,
--						  core_rate);
--
--		/* And drop the temporary request */
-+	if (vc4->hvs && vc4->hvs->hvs5)
- 		clk_request_done(core_req);
--	}
- 
- 	drm_atomic_state_put(state);
- 
--- 
-2.32.0
-

core/linux-raspberrypi4/PKGBUILD

@@ -11,7 +11,7 @@ _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi 4"
 pkgver=5.10.44
-pkgrel=2
+pkgrel=3
 arch=('armv7h' 'aarch64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -23,18 +23,14 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         'cmdline.txt'
         'linux.preset'
         '0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch'
-        '0002-Revert-drm-Introduce-new-state-accessors-in-place-of.patch'
+        "0002-PR4402.patch::https://patch-diff.githubusercontent.com/raw/raspberrypi/linux/pull/4402.patch"
-        '0003-Revert-drm-vc4-Make-vc4_crtc_get_encoder-public.patch'
-        '0004-Revert-drm-vc4-Increase-the-core-clock-based-on-HVS-.patch'
         '60-linux.hook'
         '90-linux.hook')
 md5sums=('3182aa0662a90169b1410d13daf2e481'
          '31c02f4518d46deb5f0c2ad1f8b083cd'
          '86d4a35722b5410e3b29fc92dae15d4b'
          'f66a7ea3feb708d398ef57e4da4815e9'
-         '60d3c9aef3640bcffd56af279470d3f7'
+         '91a6652440c504ac3262b3abf4a5ee63'
-         '033b9494d50a28fa791e79a5a57928ef'
-         'e971270540d9760994d5b80a25a9811d'
          'ce6c81ad1ad1f8b333fd6077d47abdaf'
          '441ec084c47cddc53e592fb0cbce4edf')
 md5sums_armv7h=('af18f07e44268238ae95cfe3814bb8f8'
@@ -61,9 +57,7 @@ prepare() {
   patch -Np1 -i ../0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
 
   # see: https://archlinuxarm.org/forum/viewtopic.php?f=65&t=15398
-  patch -Np1 -i ../0002-Revert-drm-Introduce-new-state-accessors-in-place-of.patch
+  patch -Np1 -i ../0002-PR4402.patch
-  patch -Np1 -i ../0003-Revert-drm-vc4-Make-vc4_crtc_get_encoder-public.patch
-  patch -Np1 -i ../0004-Revert-drm-vc4-Increase-the-core-clock-based-on-HVS-.patch
 }
 
 build() {