diff options
author | dragonn | 2020-06-25 22:36:07 +0200 |
---|---|---|
committer | dragonn | 2020-06-25 22:36:07 +0200 |
commit | bcce1ba72d895c6d6bcb70bc12eccc77aefa8601 (patch) | |
tree | b8109cb456644b8f77f339050a86f467ca9d53d6 | |
parent | 3442c87a0944c06cc9f28bc6253b4dfa5a34450a (diff) | |
download | aur-bcce1ba72d895c6d6bcb70bc12eccc77aefa8601.tar.gz |
Update to 5.7.5, add GA502IV
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | amdgpu-drm-next.patch | 18 | ||||
-rw-r--r-- | asus-wmi.patch | 82 | ||||
-rw-r--r-- | i8042v2.patch | 19 | ||||
-rw-r--r-- | k10-temp.patch | 109 |
6 files changed, 66 insertions, 186 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-g14 pkgdesc = Linux witch patches for ASUS ROG Zephyrus G14/G15 - pkgver = 5.7.4.arch1 + pkgver = 5.7.5.arch1 pkgrel = 1 url = https://lab.retarded.farm/zappel/asus-rog-zephyrus-g14/ arch = x86_64 @@ -12,11 +12,10 @@ pkgbase = linux-g14 makedepends = xmlto makedepends = git options = !strip - source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.7.4-arch1 + source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.7.5-arch1 source = config source = sphinx-workaround.patch source = amdgpu-backlight.patch - source = k10-temp.patch source = asus-wmi.patch source = i8042v2.patch source = amdgpu-drm-next.patch @@ -27,10 +26,9 @@ pkgbase = linux-g14 sha256sums = 623601ed9d7879dd9dba1cd50fc8051f9db508b49b4fc0c47c5a9eb9165fc04e sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c sha256sums = 8f9bb0be13e47b8fff55702bb4ea6f4d88eed5b5350d6e7025519f4dcb3cff79 - sha256sums = 28d35438857ffe9fccab8d05e22cd9c590f3b52172809e78d726f035f4b5557f - sha256sums = 00e785b1f72de3387eab601d142664e47b5c53f13dd68a256d56a12c69621e21 - sha256sums = bfa48d1d986acf6ab99600dcffff87ab9d595e80a90027eb2328b71d137b2f21 - sha256sums = a70d0907eb55f9db1e4d945ad738bf12c249b2e98ec9a9b9d813ddb27302adff + sha256sums = c02097b19f85b6d3d6ee93b28e805eb9dd1b7f7d8b619332280e1fa48a279b15 + sha256sums = 554246e9b44e2ecf153959ef5b505d2085d2b5aa2852a4c4de5b595c8e8a9d96 + sha256sums = 419913c6b686c6b98fbac82ac9c2ea3c30d130f94de3bb28d6a58bd1c5234814 pkgname = linux-g14 pkgdesc = The Linux witch patches for ASUS ROG Zephyrus G14/G15 kernel and modules @@ -1,7 +1,7 @@ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=linux-g14 -pkgver=5.7.4.arch1 +pkgver=5.7.5.arch1 pkgrel=1 pkgdesc='Linux witch patches for ASUS ROG Zephyrus G14/G15' _srctag=v${pkgver%.*}-${pkgver##*.} @@ -20,7 +20,6 @@ source=( config # the main kernel config file sphinx-workaround.patch amdgpu-backlight.patch - k10-temp.patch asus-wmi.patch i8042v2.patch amdgpu-drm-next.patch @@ -35,10 +34,11 @@ sha256sums=('SKIP' '623601ed9d7879dd9dba1cd50fc8051f9db508b49b4fc0c47c5a9eb9165fc04e' '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c' '8f9bb0be13e47b8fff55702bb4ea6f4d88eed5b5350d6e7025519f4dcb3cff79' - '28d35438857ffe9fccab8d05e22cd9c590f3b52172809e78d726f035f4b5557f' - '00e785b1f72de3387eab601d142664e47b5c53f13dd68a256d56a12c69621e21' - 'bfa48d1d986acf6ab99600dcffff87ab9d595e80a90027eb2328b71d137b2f21' - 'a70d0907eb55f9db1e4d945ad738bf12c249b2e98ec9a9b9d813ddb27302adff') + 'c02097b19f85b6d3d6ee93b28e805eb9dd1b7f7d8b619332280e1fa48a279b15' + '554246e9b44e2ecf153959ef5b505d2085d2b5aa2852a4c4de5b595c8e8a9d96' + '419913c6b686c6b98fbac82ac9c2ea3c30d130f94de3bb28d6a58bd1c5234814') + + diff --git a/amdgpu-drm-next.patch b/amdgpu-drm-next.patch index 5898a9bfc650..46f340e39d91 100644 --- a/amdgpu-drm-next.patch +++ b/amdgpu-drm-next.patch @@ -136,21 +136,3 @@ index c7c9e07962b9..623745b2d8b3 100644 vega20_reg_base_init(adev); break; -diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c -index 0e638a77b5ee..babc966cdabd 100644 ---- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c -+++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c -@@ -1709,12 +1709,8 @@ static int dcn21_populate_dml_pipes_from_context( - { - uint32_t pipe_cnt = dcn20_populate_dml_pipes_from_context(dc, context, pipes); - int i; -- struct resource_context *res_ctx = &context->res_ctx; - -- for (i = 0; i < dc->res_pool->pipe_count; i++) { -- -- if (!res_ctx->pipe_ctx[i].stream) -- continue; -+ for (i = 0; i < pipe_cnt; i++) { - - pipes[i].pipe.src.hostvm = 1; - pipes[i].pipe.src.gpuvm = 1; diff --git a/asus-wmi.patch b/asus-wmi.patch index 273bf0c7d5cf..7d36c313442d 100644 --- a/asus-wmi.patch +++ b/asus-wmi.patch @@ -1,5 +1,5 @@ diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c -index c4404d9c1de4..e449f4b050c2 100644 +index c4404d9c1de4..e53c258acf68 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c @@ -110,6 +110,18 @@ static struct quirk_entry quirk_asus_forceals = { @@ -21,52 +21,46 @@ index c4404d9c1de4..e449f4b050c2 100644 static int dmi_matched(const struct dmi_system_id *dmi) { pr_info("Identified laptop model '%s'\n", dmi->ident); -@@ -411,7 +423,34 @@ static const struct dmi_system_id asus_quirks[] = { +@@ -411,6 +423,42 @@ static const struct dmi_system_id asus_quirks[] = { }, .driver_data = &quirk_asus_forceals, }, -- {}, + { -+ .callback = dmi_matched, -+ .ident = "ASUSTeK COMPUTER INC. GA401IV", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"), -+ }, -+ .driver_data = &quirk_asus_ga401i, -+ }, -+ { -+ .callback = dmi_matched, -+ .ident = "ASUSTeK COMPUTER INC. GA401IU", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"), -+ }, -+ .driver_data = &quirk_asus_ga401i, -+ }, -+ { -+ .callback = dmi_matched, -+ .ident = "ASUSTeK COMPUTER INC. GA502IU", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), -+ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"), -+ }, -+ .driver_data = &quirk_asus_ga502i, -+ }, -+ {}, ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA401IV", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"), ++ }, ++ .driver_data = &quirk_asus_ga401i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA401IU", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"), ++ }, ++ .driver_data = &quirk_asus_ga401i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA502IU", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"), ++ }, ++ .driver_data = &quirk_asus_ga502i, ++ }, ++ { ++ .callback = dmi_matched, ++ .ident = "ASUSTeK COMPUTER INC. GA502IV", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"), ++ }, ++ .driver_data = &quirk_asus_ga502i, ++ }, + {}, }; - static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver) -diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index 01becbe2a9a8..acbc3626852b 100644 ---- a/drivers/platform/x86/asus-wmi.c -+++ b/drivers/platform/x86/asus-wmi.c -@@ -116,6 +116,8 @@ struct bios_args { - u32 arg0; - u32 arg1; - u32 arg2; /* At least TUF Gaming series uses 3 dword input buffer. */ -+ u32 arg3; /* At least ROG Zephyrus G14 series uses 5 dword input buffer */ -+ u32 arg4; - } __packed; - - /* diff --git a/i8042v2.patch b/i8042v2.patch index 08e42434a060..9cef0ce4be8f 100644 --- a/i8042v2.patch +++ b/i8042v2.patch @@ -1,8 +1,8 @@ diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h -index 7e048b557462..95452f33d37f 100644 +index 7e048b557462..ee19299ed081 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h -@@ -698,6 +698,20 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = { +@@ -698,6 +698,34 @@ static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = { DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), }, }, @@ -20,5 +20,20 @@ index 7e048b557462..95452f33d37f 100644 + DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"), + }, + }, ++ { ++ /* ASUS ROG Zephyreus G15 GA502IU */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"), ++ }, ++ }, ++ { ++ /* ASUS ROG Zephyreus G14 GA502IV */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"), ++ }, ++ }, { } }; + diff --git a/k10-temp.patch b/k10-temp.patch deleted file mode 100644 index a785335303de..000000000000 --- a/k10-temp.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- a/drivers/hwmon/k10temp.c -+++ b/drivers/hwmon/k10temp.c -@@ -632,6 +632,7 @@ static const struct pci_device_id k10temp_id_table[] = { - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, -+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) }, - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, - { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) }, - {} - ---- a/drivers/edac/amd64_edac.c -+++ b/drivers/edac/amd64_edac.c -@@ -2316,6 +2316,16 @@ static struct amd64_family_type family_types[] = { - .dbam_to_cs = f17_addr_mask_to_cs_size, - } - }, -+ [F17_M60H_CPUS] = { -+ .ctl_name = "F17h_M60h", -+ .f0_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F0, -+ .f6_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F6, -+ .max_mcs = 2, -+ .ops = { -+ .early_channel_count = f17_early_channel_count, -+ .dbam_to_cs = f17_addr_mask_to_cs_size, -+ } -+ }, - [F17_M70H_CPUS] = { - .ctl_name = "F17h_M70h", - .f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0, -@@ -3354,6 +3364,10 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) - fam_type = &family_types[F17_M30H_CPUS]; - pvt->ops = &family_types[F17_M30H_CPUS].ops; - break; -+ } else if (pvt->model >= 0x60 && pvt->model <= 0x6f) { -+ fam_type = &family_types[F17_M60H_CPUS]; -+ pvt->ops = &family_types[F17_M60H_CPUS].ops; -+ break; - } else if (pvt->model >= 0x70 && pvt->model <= 0x7f) { - fam_type = &family_types[F17_M70H_CPUS]; - pvt->ops = &family_types[F17_M70H_CPUS].ops; ---- a/drivers/edac/amd64_edac.h -+++ b/drivers/edac/amd64_edac.h -@@ -120,6 +120,8 @@ - #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee - #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490 - #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496 -+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F0 0x1448 -+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F6 0x144e - #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F0 0x1440 - #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F6 0x1446 - #define PCI_DEVICE_ID_AMD_19H_DF_F0 0x1650 -@@ -293,6 +295,7 @@ enum amd_families { - F17_CPUS, - F17_M10H_CPUS, - F17_M30H_CPUS, -+ F17_M60H_CPUS, - F17_M70H_CPUS, - F19_CPUS, - NUM_FAMILIES, - ---- a/arch/x86/kernel/amd_nb.c -+++ b/arch/x86/kernel/amd_nb.c -@@ -18,9 +18,11 @@ - #define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450 - #define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0 - #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480 -+#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630 - #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464 - #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec - #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494 -+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c - #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444 - #define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654 - -@@ -33,6 +35,7 @@ static const struct pci_device_id amd_root_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_ROOT) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_ROOT) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_ROOT) }, - {} - }; - -@@ -50,6 +53,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) }, -@@ -65,6 +69,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) }, -+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) }, - { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, ---- a/include/linux/pci_ids.h -+++ b/include/linux/pci_ids.h -@@ -550,6 +550,7 @@ - #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 - #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb - #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 -+#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b - #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443 - #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653 - #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
\ No newline at end of file |