From 4a1924db743abf312f5ae293153820a9e3c6211c Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 19 Feb 2021 17:21:27 -0800 Subject: Updated to 5.11.0 --- ...-Qualcomm-Bluetooth-adapters-stop-working.patch | 50 ++++++ ...rackpad-2-to-hid_have_special_driver-list.patch | 36 ---- ...current-context-instead-of-recreating-one.patch | 181 +++++++++++++++++++++ 0004-drm-amdgpu-fix-shutdown-with-s0ix.patch | 77 +++++++++ PKGBUILD | 72 ++++---- config | 174 ++++++++++++++------ sphinx-workaround.patch | 19 +++ 7 files changed, 490 insertions(+), 119 deletions(-) create mode 100644 0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-stop-working.patch delete mode 100644 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch create mode 100644 0003-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch create mode 100644 0004-drm-amdgpu-fix-shutdown-with-s0ix.patch create mode 100644 sphinx-workaround.patch diff --git a/0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-stop-working.patch b/0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-stop-working.patch new file mode 100644 index 0000000..d1e59b0 --- /dev/null +++ b/0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-stop-working.patch @@ -0,0 +1,50 @@ +From 66b6d6c8306329134abeeb26d352f2074b2f0e1e Mon Sep 17 00:00:00 2001 +From: Hui Wang +Date: Mon, 8 Feb 2021 13:02:37 +0800 +Subject: 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 03b83aa91277..32161dd40ed6 100644 +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -4069,6 +4069,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; + } +-- +cgit v1.2.3-1-gf6bb5 + diff --git a/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch b/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch deleted file mode 100644 index 49bbf22..0000000 --- a/0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2dad55f373693e9e808fbdc836614162924990a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Felix=20H=C3=A4dicke?= -Date: Thu, 19 Nov 2020 09:22:32 +0100 -Subject: HID: quirks: Add Apple Magic Trackpad 2 to hid_have_special_driver - list -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The Apple Magic Trackpad 2 is handled by the magicmouse driver. And -there were severe stability issues when both drivers (hid-generic and -hid-magicmouse) were loaded for this device. - -Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=210241 - -Signed-off-by: Felix Hädicke ---- - drivers/hid/hid-quirks.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index bf7ecab5d9e5..142e9dae2837 100644 ---- a/drivers/hid/hid-quirks.c -+++ b/drivers/hid/hid-quirks.c -@@ -478,6 +478,8 @@ static const struct hid_device_id hid_have_special_driver[] = { - #if IS_ENABLED(CONFIG_HID_MAGICMOUSE) - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) }, -+ { HID_BLUETOOTH_DEVICE(BT_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) }, -+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD2) }, - #endif - #if IS_ENABLED(CONFIG_HID_MAYFLASH) - { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) }, --- -cgit v1.2.3-1-gf6bb5 - diff --git a/0003-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch b/0003-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch new file mode 100644 index 0000000..a9b880d --- /dev/null +++ b/0003-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch @@ -0,0 +1,181 @@ +From 15de5c46af8af7e21c34a9a1e1027ff4d7fdd93f Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 9 Feb 2021 17:21:58 -0500 +Subject: Revert "drm/amd/display: reuse current context instead of recreating + one" + +This reverts commit 8866a67ab86cc0812e65c04f1ef02bcc41e24d68. + +This breaks hotplug of HDMI on some systems, resulting in +a blank screen also causes failures for displays to light up +on other systems. + +Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1487 +Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1492 +Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211649 +Signed-off-by: Alex Deucher +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 ++++++++++--------- + drivers/gpu/drm/amd/display/dc/core/dc.c | 27 +++++++---------------- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 ++- + 3 files changed, 23 insertions(+), 30 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +index 961abf1cf040..e438baa1adc1 100644 +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -1934,7 +1934,7 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state, + dc_commit_updates_for_stream( + dm->dc, bundle->surface_updates, + dc_state->stream_status->plane_count, +- dc_state->streams[k], &bundle->stream_update); ++ dc_state->streams[k], &bundle->stream_update, dc_state); + } + + cleanup: +@@ -1965,7 +1965,8 @@ static void dm_set_dpms_off(struct dc_link *link) + + stream_update.stream = stream_state; + dc_commit_updates_for_stream(stream_state->ctx->dc, NULL, 0, +- stream_state, &stream_update); ++ stream_state, &stream_update, ++ stream_state->ctx->dc->current_state); + mutex_unlock(&adev->dm.dc_lock); + } + +@@ -7548,7 +7549,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, + struct drm_crtc *pcrtc, + bool wait_for_vblank) + { +- int i; ++ uint32_t i; + uint64_t timestamp_ns; + struct drm_plane *plane; + struct drm_plane_state *old_plane_state, *new_plane_state; +@@ -7589,7 +7590,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, + amdgpu_dm_commit_cursors(state); + + /* update planes when needed */ +- for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) { ++ for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { + struct drm_crtc *crtc = new_plane_state->crtc; + struct drm_crtc_state *new_crtc_state; + struct drm_framebuffer *fb = new_plane_state->fb; +@@ -7812,7 +7813,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, + bundle->surface_updates, + planes_count, + acrtc_state->stream, +- &bundle->stream_update); ++ &bundle->stream_update, ++ dc_state); + + /** + * Enable or disable the interrupts on the backend. +@@ -8148,13 +8150,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) + struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state); + struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state); + struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc); +- struct dc_surface_update surface_updates[MAX_SURFACES]; ++ struct dc_surface_update dummy_updates[MAX_SURFACES]; + struct dc_stream_update stream_update; + struct dc_info_packet hdr_packet; + struct dc_stream_status *status = NULL; + bool abm_changed, hdr_changed, scaling_changed; + +- memset(&surface_updates, 0, sizeof(surface_updates)); ++ memset(&dummy_updates, 0, sizeof(dummy_updates)); + memset(&stream_update, 0, sizeof(stream_update)); + + if (acrtc) { +@@ -8211,15 +8213,16 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) + * To fix this, DC should permit updating only stream properties. + */ + for (j = 0; j < status->plane_count; j++) +- surface_updates[j].surface = status->plane_states[j]; ++ dummy_updates[j].surface = status->plane_states[0]; + + + mutex_lock(&dm->dc_lock); + dc_commit_updates_for_stream(dm->dc, +- surface_updates, ++ dummy_updates, + status->plane_count, + dm_new_crtc_state->stream, +- &stream_update); ++ &stream_update, ++ dc_state); + mutex_unlock(&dm->dc_lock); + } + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c +index 6cf1a5a2a5ec..58eb0d69873a 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c +@@ -2679,7 +2679,8 @@ void dc_commit_updates_for_stream(struct dc *dc, + struct dc_surface_update *srf_updates, + int surface_count, + struct dc_stream_state *stream, +- struct dc_stream_update *stream_update) ++ struct dc_stream_update *stream_update, ++ struct dc_state *state) + { + const struct dc_stream_status *stream_status; + enum surface_update_type update_type; +@@ -2698,12 +2699,6 @@ void dc_commit_updates_for_stream(struct dc *dc, + + + if (update_type >= UPDATE_TYPE_FULL) { +- struct dc_plane_state *new_planes[MAX_SURFACES]; +- +- memset(new_planes, 0, sizeof(new_planes)); +- +- for (i = 0; i < surface_count; i++) +- new_planes[i] = srf_updates[i].surface; + + /* initialize scratch memory for building context */ + context = dc_create_state(dc); +@@ -2712,21 +2707,15 @@ void dc_commit_updates_for_stream(struct dc *dc, + return; + } + +- dc_resource_state_copy_construct( +- dc->current_state, context); ++ dc_resource_state_copy_construct(state, context); + +- /*remove old surfaces from context */ +- if (!dc_rem_all_planes_for_stream(dc, stream, context)) { +- DC_ERROR("Failed to remove streams for new validate context!\n"); +- return; +- } ++ for (i = 0; i < dc->res_pool->pipe_count; i++) { ++ struct pipe_ctx *new_pipe = &context->res_ctx.pipe_ctx[i]; ++ struct pipe_ctx *old_pipe = &dc->current_state->res_ctx.pipe_ctx[i]; + +- /* add surface to context */ +- if (!dc_add_all_planes_for_stream(dc, stream, new_planes, surface_count, context)) { +- DC_ERROR("Failed to add streams for new validate context!\n"); +- return; ++ if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state) ++ new_pipe->plane_state->force_full_update = true; + } +- + } + + +diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h +index e243c01b9672..b7910976b81a 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h ++++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h +@@ -283,7 +283,8 @@ void dc_commit_updates_for_stream(struct dc *dc, + struct dc_surface_update *srf_updates, + int surface_count, + struct dc_stream_state *stream, +- struct dc_stream_update *stream_update); ++ struct dc_stream_update *stream_update, ++ struct dc_state *state); + /* + * Log the current stream state. + */ +-- +cgit v1.2.3-1-gf6bb5 + diff --git a/0004-drm-amdgpu-fix-shutdown-with-s0ix.patch b/0004-drm-amdgpu-fix-shutdown-with-s0ix.patch new file mode 100644 index 0000000..0427bc0 --- /dev/null +++ b/0004-drm-amdgpu-fix-shutdown-with-s0ix.patch @@ -0,0 +1,77 @@ +From 7e63b4196ca6366bbc43741f340b33988c660c33 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Thu, 18 Feb 2021 12:05:53 -0500 +Subject: drm/amdgpu: fix shutdown with s0ix + +For shutdown needs to be handled differently and s0ix. Add +a new flag to shutdown and use it to adjust behavior appropriately. + +Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1499 +Fixes: 628c36d7b238e2 ("drm/amdgpu: update amdgpu device suspend/resume sequence for s0i3 support") +Signed-off-by: Alex Deucher +Cc: Prike Liang +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 ++ + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 5993dd0fdd8e..4ae244048d53 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -1002,6 +1002,7 @@ struct amdgpu_device { + /* s3/s4 mask */ + bool in_suspend; + bool in_hibernate; ++ bool in_shutdown; + + atomic_t in_gpu_reset; + enum pp_mp1_state mp1_state; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +index cab1ebaf6d62..d07ff05ad042 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +@@ -2666,7 +2666,8 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev) + { + int i, r; + +- if (!amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) { ++ if (adev->in_shutdown || ++ !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) { + amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE); + amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE); + } +@@ -3726,7 +3727,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) + + amdgpu_fence_driver_suspend(adev); + +- if (!amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) ++ if (adev->in_shutdown || ++ !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) + r = amdgpu_device_ip_suspend_phase2(adev); + else + amdgpu_gfx_state_change_set(adev, sGpuChangeState_D3Entry); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +index 7169fb5e3d9c..2aacb96cf320 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -1259,6 +1259,7 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) + if (amdgpu_ras_intr_triggered()) + return; + ++ adev->in_shutdown = true; + /* if we are running in a VM, make sure the device + * torn down properly on reboot/shutdown. + * unfortunately we can't detect certain +@@ -1268,6 +1269,7 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) + adev->mp1_state = PP_MP1_STATE_UNLOAD; + amdgpu_device_ip_suspend(adev); + adev->mp1_state = PP_MP1_STATE_NONE; ++ adev->in_shutdown = false; + } + + static int amdgpu_pmops_suspend(struct device *dev) +-- +cgit v1.2.3-1-gf6bb5 + diff --git a/PKGBUILD b/PKGBUILD index d1e33f8..10d7bc0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,8 +14,8 @@ pkgbase=linux-libre _supver=5 -_majver=10 -_minver=16 +_majver=11 +_minver=0 _gccpatchver='20201113' _gccpatchger='10.1' _gccpatchker='5.8' @@ -31,7 +31,7 @@ arch=(x86_64) license=(GPL2) makedepends=( bc kmod libelf pahole cpio perl tar xz -# xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick + xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick ) conflicts=('linux') options=('!strip') @@ -41,8 +41,11 @@ _gnupkgver=${pkgver}-gnu source=( https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign} config # the main kernel config file + sphinx-workaround.patch # Sphinx 3.5 broke the build again 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch + 0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-stop-working.patch + 0003-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch + 0004-drm-amdgpu-fix-shutdown-with-s0ix.patch kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz ath9k-regdom-hack.patch raid6-default-algo.patch @@ -53,16 +56,17 @@ source=( validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva ) -b2sums=('86103699a6bc906e85429430df098b0ddb7cfc8c887f98b37f994498388d634554e119eadb1b15f591bdf4f463e7efb7420e3e370af0029b7ed9e988a5f26b01' +b2sums=('bdecaaf3c3684ab8fd92f4c5a8a85c6abb6e8a11dca2d07fb91baa1d36611ad2493627c5a6576e6db6ae52317bbbb38a134892fd48ebb8fe0386ba9f401768d3' 'SKIP' - 'af2691c573f03530fbd0eb0700879031ca4e6e07140673c9dadd0690f59fb26846add66c36aa5d2c466968cff75eb16d13cb8927a812711724e4eebbb5dda056' + 'a87284197631233c3de130f349c9a89f5d08d1595c5dcbb1ee2b1ff90f5de36d6cd89c4238375126978bad5fad6d2de049b848f2caf0ab48c8d530e96a61081a' + 'db64b425139c107c69f44624901ae50b5e604d4c9fdfe84f78c298f8ed7a7739033a72ec678c5c3c0e82e59809d97799d0c25f96c64ef5ae79910cb890fc7bfb' '2f9195675270d79d735a3aaec25887c2f80b76eae98be8fcc5fd59ab71d925c5ee20ec5e2a015deb68b61bc2cc7f56f546a22cb96ee038e2e24c2c9dd5c3f79f' - 'd8297e09f552a2d6bb24c2ba10481fd2b407057f3b24278e72a89233473460d339c83838791989773623178b5af80588fb4c484da2931f1040e313cce7ceca00' + 'ee2176084665f1a5f1999157cb128c8c68c113b5d22c4d72bec689123493d7a9b246e1c7cff7d6ff4bba8d5c5624b4dc75f2274db941e9b3d352e41fbad86927' + '1e3a9aadc3e944afd9601457f69218fd4cf61badabed6924622bce3273c2a95602fc6aab00c1399767f5115d3fbecde391b553acc259c817f8d6b29a18b1f8ad' + 'a5c4d1bf3b15e3ee2491f75485627ebf1a9f6759f38798c08fcd09bf90b40fed997d7f14190809f4e676907f8a1c9150e3de2da856c8b92e022d3250a86040fe' '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127' 'b6ef77035611139fa9a6d5b8d30570e2781bb4da483bb569884b0bd0129b62e0b82a5a6776fefe43fee801c70d39de1ea4d4c177f7cedd5ac135e3c64f7b895a' - 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' - '0b54ec87bcc287cc9af09e296b233695f329edade78eac0faf9a42969e82a61c3d212f3c98836b7d1a5a48caa74cfa6192ce651b00d5bddbf1c8bc3d49d031bd' - 'SKIP') + 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a') export KBUILD_BUILD_HOST=arc4linux export KBUILD_BUILD_USER=$pkgbase @@ -84,7 +88,10 @@ prepare() { # Hotfixes echo "Applying hotfixes" patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - patch -p1 -i ../0002-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_special_driver-list.patch + patch -p1 -i ../0002-Bluetooth-btusb-Some-Qualcomm-Bluetooth-adapters-stop-working.patch + patch -p1 -i ../0003-Revert-drm-amd-display-reuse-current-context-instead-of-recreating-one.patch + patch -p1 -i ../0004-drm-amdgpu-fix-shutdown-with-s0ix.patch + patch -p1 -i ../sphinx-workaround.patch # graysky gcc patch @@ -146,7 +153,7 @@ prepare() { build() { cd $_srcname make all - #make htmldocs + make htmldocs } _package() { @@ -256,27 +263,26 @@ _package-headers() { ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase" } -#_package-docs() { -# pkgdesc="Documentation for the $pkgdesc kernel" -# -# cd $_srcname -# local builddir="$pkgdir/usr/lib/modules/$(