diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 82a10aff9428.patch | 43 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | config | 4 |
4 files changed, 10 insertions, 56 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-jcore pkgdesc = Kernel for Manjaro/EndeavourOS/Arch (ACS override patch include) - pkgver = 6.3.4 + pkgver = 6.3.7 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -21,11 +21,10 @@ pkgbase = linux-jcore replaces = linux-acs-manjaro replaces = linux-acs-manjaro-headers options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.4.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.3.7.tar.xz source = config source = 0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch source = 0103-Bluetooth_fix_deadlock_for_RFCOMM_sk_state_change.patch - source = 82a10aff9428.patch source = 0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch source = 0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch source = 0303-revert-fbcon-remove-soft-scrollback-code.patch @@ -43,11 +42,10 @@ pkgbase = linux-jcore source = 0412-bootsplash.patch source = 0413-bootsplash.gitpatch source = 0999-acs.gitpatch - sha256sums = d8627528ed6b3ae607d00b1ef5a46e0e7051ae40b285fd4e82f4ff0bb72b68e8 - sha256sums = 546fcc3f18f7b2b556b1afe1f43e84e1fd18f6376da201a6b200d08d089fb8f9 + sha256sums = fe369743996c522a7b473e99dcf8f88847bd5cc88546fd3b7a41d9fe5a5b97a9 + sha256sums = b538481a355e88fa3888649d1c8836da4669b0fa93734ca72af8bef277ed1864 sha256sums = 05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467 sha256sums = a8a2d8b402b2877df1a949a106c634b6c366dd33b954c4b735ce1d3778214169 - sha256sums = 3cd0d68a430ba5267a944bdc81eb711fa078d08dd796d7a28cc3723f4796edbf sha256sums = 2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326 sha256sums = 94a8538251ad148f1025cc3de446ce64f73dc32b01815426fb159c722e8fa5bc sha256sums = 50f4ccc4aeb0ffb8ec648b90a84ff188dbfed5364075cf0c6045c5696caf6ca9 diff --git a/82a10aff9428.patch b/82a10aff9428.patch deleted file mode 100644 index 83f9fb2db960..000000000000 --- a/82a10aff9428.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 82a10aff9428f1d190de55ef7971fdb84303cc7a Mon Sep 17 00:00:00 2001 -From: Aric Cyr <aric.cyr@amd.com> -Date: Sat, 11 Feb 2023 10:03:22 -0500 -Subject: [PATCH] drm/amd/display: Only wait for blank completion if OTG active - -[why] -If OTG is not active, waiting for blank completion will always fail and -timeout resulting in unnecessary driver delays. - -[how] -Check that OTG is enabled before waiting for blank. - -Reviewed-by: Alvin Lee <Alvin.Lee2@amd.com> -Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com> -Signed-off-by: Aric Cyr <aric.cyr@amd.com> -Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - drivers/gpu/drm/amd/display/dc/core/dc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c -index d4a1670a54506a..f07cba121d010e 100644 ---- a/drivers/gpu/drm/amd/display/dc/core/dc.c -+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c -@@ -1093,7 +1093,8 @@ static void phantom_pipe_blank( - otg_active_height, - 0); - -- hws->funcs.wait_for_blank_complete(opp); -+ if (tg->funcs->is_tg_enabled(tg)) -+ hws->funcs.wait_for_blank_complete(opp); - } - - static void disable_dangling_plane(struct dc *dc, struct dc_state *context) -@@ -1156,6 +1157,7 @@ static void disable_dangling_plane(struct dc *dc, struct dc_state *context) - if (old_stream->mall_stream_config.type == SUBVP_PHANTOM) { - if (tg->funcs->enable_crtc) { - int main_pipe_width, main_pipe_height; -+ - main_pipe_width = old_stream->mall_stream_config.paired_stream->dst.width; - main_pipe_height = old_stream->mall_stream_config.paired_stream->dst.height; - phantom_pipe_blank(dc, tg, main_pipe_width, main_pipe_height); @@ -12,7 +12,7 @@ pkgbase=linux-jcore pkgname=('linux-jcore' 'linux-jcore-headers') _kernelname=-jcore _hostname=jcore -pkgver=6.3.4 +pkgver=6.3.7 pkgrel=1 pkgdesc="Kernel for Manjaro/EndeavourOS/Arch (ACS override patch include)" arch=('x86_64') @@ -28,7 +28,7 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$pkgver.tar.xz" '0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch' '0103-Bluetooth_fix_deadlock_for_RFCOMM_sk_state_change.patch' # MANJARO Patches - '82a10aff9428.patch' + # Bootsplash '0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch' '0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch' @@ -48,11 +48,10 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$pkgver.tar.xz" '0413-bootsplash.gitpatch' # ACS override patch '0999-acs.gitpatch') -sha256sums=('d8627528ed6b3ae607d00b1ef5a46e0e7051ae40b285fd4e82f4ff0bb72b68e8' - '546fcc3f18f7b2b556b1afe1f43e84e1fd18f6376da201a6b200d08d089fb8f9' +sha256sums=('fe369743996c522a7b473e99dcf8f88847bd5cc88546fd3b7a41d9fe5a5b97a9' + 'b538481a355e88fa3888649d1c8836da4669b0fa93734ca72af8bef277ed1864' '05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467' 'a8a2d8b402b2877df1a949a106c634b6c366dd33b954c4b735ce1d3778214169' - '3cd0d68a430ba5267a944bdc81eb711fa078d08dd796d7a28cc3723f4796edbf' '2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326' '94a8538251ad148f1025cc3de446ce64f73dc32b01815426fb159c722e8fa5bc' '50f4ccc4aeb0ffb8ec648b90a84ff188dbfed5364075cf0c6045c5696caf6ca9' @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.3.4-2 Kernel Configuration +# Linux/x86 6.3.7-1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.1 20230429" CONFIG_CC_IS_GCC=y @@ -28,7 +28,7 @@ CONFIG_THREAD_INFO_IN_TASK=y CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set # CONFIG_WERROR is not set -CONFIG_LOCALVERSION="-jcore" +CONFIG_LOCALVERSION="-JCORE" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y |