From 99f2921a2ac4e46ee885731788777e4abd9f1472 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Fri, 28 Jun 2024 10:55:22 +0530 Subject: [PATCH] 6.10 --- 1002-Put-apple-bce-in-drivers-staging.patch | 4 +- ...ver-for-Apple-Touch-Bars-in-x86-Macs.patch | 4 +- 2008-i915-4-lane-quirk-for-mbp15-1.patch | 48 +++++++++++-------- 8001-Add-APFS-driver.patch | 6 +-- version | 2 +- 5 files changed, 36 insertions(+), 28 deletions(-) diff --git a/1002-Put-apple-bce-in-drivers-staging.patch b/1002-Put-apple-bce-in-drivers-staging.patch index f326a9a..e3f941f 100644 --- a/1002-Put-apple-bce-in-drivers-staging.patch +++ b/1002-Put-apple-bce-in-drivers-staging.patch @@ -26,8 +26,8 @@ diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index f8c3aa9c2..1e148d6c3 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -29,3 +29,4 @@ obj-$(CONFIG_PI433) += pi433/ - obj-$(CONFIG_PI433) += pi433/ +@@ -29,3 +29,4 @@ obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/ + obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/ obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/ obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ +obj-$(CONFIG_APPLE_BCE) += apple-bce/ diff --git a/1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch b/1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch index 6371979..af83d64 100644 --- a/1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch +++ b/1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch @@ -30,7 +30,7 @@ index 519b3b736..dfc63d257 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6372,6 +6372,12 @@ S: Supported - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/sun4i/sun8i* +DRM DRIVER FOR APPLE TOUCH BARS @@ -41,7 +41,7 @@ index 519b3b736..dfc63d257 100644 + DRM DRIVER FOR ARM PL111 CLCD S: Orphan - T: git git://anongit.freedesktop.org/drm/drm-misc + T: git https://gitlab.freedesktop.org/drm/misc/kernel.git diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index f6889f649..559a97bce 100644 --- a/drivers/gpu/drm/tiny/Kconfig diff --git a/2008-i915-4-lane-quirk-for-mbp15-1.patch b/2008-i915-4-lane-quirk-for-mbp15-1.patch index b58d364..3e8c9e4 100644 --- a/2008-i915-4-lane-quirk-for-mbp15-1.patch +++ b/2008-i915-4-lane-quirk-for-mbp15-1.patch @@ -1,37 +1,45 @@ -From 12c7a3306a631a651464ef56318a218dc4cdb157 Mon Sep 17 00:00:00 2001 +From 8a84123c2f8619a14f9fc493db2528e59fcc0db8 Mon Sep 17 00:00:00 2001 From: Orlando Chamberlain -Date: Sat, 18 Feb 2023 23:05:05 +1100 +Date: Fri, 28 Jun 2024 04:43:50 +0000 Subject: [PATCH 8/9] i915: 4 lane quirk for mbp15,1 Needed to use iGPU when dGPU was boot GPU Patch written by Kerem Karabay --- - drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++ + drivers/gpu/drm/i915/display/intel_ddi.c | 4 ++++ drivers/gpu/drm/i915/display/intel_quirks.c | 15 +++++++++++++++ drivers/gpu/drm/i915/display/intel_quirks.h | 1 + - 3 files changed, 19 insertions(+) + 3 files changed, 20 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c -index 0f1ec2a98cc8..1ec67390f623 100644 +index 3c3fc5337..c16e0b1d1 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c -@@ -4097,6 +4097,9 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port) +@@ -4645,6 +4645,7 @@ intel_ddi_init_hdmi_connector(struct intel_digital_port *dig_port) + + static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port) + { ++ struct intel_display *display = to_intel_display(dig_port); + struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev); + + if (dig_port->base.port != PORT_A) +@@ -4653,6 +4654,9 @@ static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port) if (dig_port->saved_port_bits & DDI_A_4_LANES) return false; -+ if (intel_has_quirk(dev_priv, QUIRK_DDI_A_FORCE_4_LANES)) ++ if (intel_has_quirk(display, QUIRK_DDI_A_FORCE_4_LANES)) + return true; + /* Broxton/Geminilake: Bspec says that DDI_A_4_LANES is the only * supported configuration */ diff --git a/drivers/gpu/drm/i915/display/intel_quirks.c b/drivers/gpu/drm/i915/display/intel_quirks.c -index 6e48d3bcdfec..a8c55e165b46 100644 +index 14d5fefc9..727639b8f 100644 --- a/drivers/gpu/drm/i915/display/intel_quirks.c +++ b/drivers/gpu/drm/i915/display/intel_quirks.c -@@ -59,6 +59,18 @@ static void quirk_increase_ddi_disabled_time(struct drm_i915_private *i915) - drm_info(&i915->drm, "Applying Increase DDI Disabled quirk\n"); +@@ -59,6 +59,18 @@ static void quirk_increase_ddi_disabled_time(struct intel_display *display) + drm_info(display->drm, "Applying Increase DDI Disabled quirk\n"); } +/* @@ -40,16 +48,16 @@ index 6e48d3bcdfec..a8c55e165b46 100644 + * quirk is used to force it as otherwise it might not be possible to compute a + * valid link configuration. + */ -+static void quirk_ddi_a_force_4_lanes(struct drm_i915_private *i915) ++static void quirk_ddi_a_force_4_lanes(struct intel_display *display) +{ -+ intel_set_quirk(i915, QUIRK_DDI_A_FORCE_4_LANES); -+ drm_info(&i915->drm, "Applying DDI A Forced 4 Lanes quirk\n"); ++ intel_set_quirk(display, QUIRK_DDI_A_FORCE_4_LANES); ++ drm_info(display->drm, "Applying DDI A Forced 4 Lanes quirk\n"); +} + - static void quirk_no_pps_backlight_power_hook(struct drm_i915_private *i915) + static void quirk_no_pps_backlight_power_hook(struct intel_display *display) { - intel_set_quirk(i915, QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK); -@@ -199,6 +211,9 @@ static struct intel_quirk intel_quirks[] = { + intel_set_quirk(display, QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK); +@@ -201,6 +213,9 @@ static struct intel_quirk intel_quirks[] = { { 0x3184, 0x1019, 0xa94d, quirk_increase_ddi_disabled_time }, /* HP Notebook - 14-r206nv */ { 0x0f31, 0x103c, 0x220f, quirk_invert_brightness }, @@ -58,9 +66,9 @@ index 6e48d3bcdfec..a8c55e165b46 100644 + { 0x3e9b, 0x106b, 0x0176, quirk_ddi_a_force_4_lanes }, }; - void intel_init_quirks(struct drm_i915_private *i915) + void intel_init_quirks(struct intel_display *display) diff --git a/drivers/gpu/drm/i915/display/intel_quirks.h b/drivers/gpu/drm/i915/display/intel_quirks.h -index 10a4d163149f..78aacf1f6f5c 100644 +index 151c8f4ae..46e7feba8 100644 --- a/drivers/gpu/drm/i915/display/intel_quirks.h +++ b/drivers/gpu/drm/i915/display/intel_quirks.h @@ -17,6 +17,7 @@ enum intel_quirk_id { @@ -70,7 +78,7 @@ index 10a4d163149f..78aacf1f6f5c 100644 + QUIRK_DDI_A_FORCE_4_LANES, }; - void intel_init_quirks(struct drm_i915_private *i915); + void intel_init_quirks(struct intel_display *display); -- -2.39.1 +2.45.2 diff --git a/8001-Add-APFS-driver.patch b/8001-Add-APFS-driver.patch index 1eabd14..6341f48 100644 --- a/8001-Add-APFS-driver.patch +++ b/8001-Add-APFS-driver.patch @@ -22177,7 +22177,7 @@ index 000000000..393a97239 + */ +static int apfs_sb_set_blocksize(struct super_block *sb, int size) +{ -+ if (set_blocksize(APFS_NXI(sb)->nx_bdev, size)) ++ if (set_blocksize(APFS_NXI(sb)->nx_bdev_file, size)) + return 0; + sb->s_blocksize = size; + sb->s_blocksize_bits = blksize_bits(size); @@ -24020,8 +24020,8 @@ index 000000000..a79a6a564 + struct apfs_nxsb_info *nxi = APFS_NXI(sb); + struct apfs_obj_phys *obj = &nxi->nx_raw->nx_o; + struct buffer_head *bh = NULL; -+ struct inode *bdev_inode = nxi->nx_bdev->bd_inode; -+ struct address_space *bdev_map = bdev_inode->i_mapping; ++ // struct inode *bdev_inode = nxi->nx_bdev->bd_inode; ++ struct address_space *bdev_map = nxi->nx_bdev->bd_mapping; + int err; + + ASSERT(!(sb->s_flags & SB_RDONLY)); diff --git a/version b/version index 6b26078..c028f0b 100644 --- a/version +++ b/version @@ -1 +1 @@ -KVER=6.9.4 +KVER=6.10-rc5