Skip to content

Commit

Permalink
6.10
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdityaGarg8
AdityaGarg8 committed Jun 27, 2024
1 parent 0ad2b39 commit b9b3a50
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions 1002-Put-apple-bce-in-drivers-staging.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions 1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions 2008-i915-4-lane-quirk-for-mbp15-1.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ diff --git a/drivers/gpu/drm/i915/display/intel_quirks.c b/drivers/gpu/drm/i915/
index 6e48d3bcdfec..a8c55e165b46 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");
}

+/*
Expand All @@ -40,15 +40,15 @@ 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);
intel_set_quirk(display, QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK);
@@ -199,6 +211,9 @@ static struct intel_quirk intel_quirks[] = {
{ 0x3184, 0x1019, 0xa94d, quirk_increase_ddi_disabled_time },
/* HP Notebook - 14-r206nv */
Expand All @@ -58,7 +58,7 @@ 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
--- a/drivers/gpu/drm/i915/display/intel_quirks.h
Expand All @@ -70,7 +70,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

6 changes: 3 additions & 3 deletions 8001-Add-APFS-driver.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
KVER=6.9.4
KVER=6.10-rc5

0 comments on commit b9b3a50

Please sign in to comment.