Skip to content

Commit 9d40ea6

Browse files
committed
6.10
1 parent 0ad2b39 commit 9d40ea6

4 files changed

+14
-14
lines changed

1002-Put-apple-bce-in-drivers-staging.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
2626
index f8c3aa9c2..1e148d6c3 100644
2727
--- a/drivers/staging/Makefile
2828
+++ b/drivers/staging/Makefile
29-
@@ -29,3 +29,4 @@ obj-$(CONFIG_PI433) += pi433/
30-
obj-$(CONFIG_PI433) += pi433/
29+
@@ -29,3 +29,4 @@ obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
30+
obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
3131
obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
3232
obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/
3333
+obj-$(CONFIG_APPLE_BCE) += apple-bce/

1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ index 519b3b736..dfc63d257 100644
3030
--- a/MAINTAINERS
3131
+++ b/MAINTAINERS
3232
@@ -6372,6 +6372,12 @@ S: Supported
33-
T: git git://anongit.freedesktop.org/drm/drm-misc
33+
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
3434
F: drivers/gpu/drm/sun4i/sun8i*
3535

3636
+DRM DRIVER FOR APPLE TOUCH BARS
@@ -41,7 +41,7 @@ index 519b3b736..dfc63d257 100644
4141
+
4242
DRM DRIVER FOR ARM PL111 CLCD
4343
S: Orphan
44-
T: git git://anongit.freedesktop.org/drm/drm-misc
44+
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
4545
diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig
4646
index f6889f649..559a97bce 100644
4747
--- a/drivers/gpu/drm/tiny/Kconfig

2008-i915-4-lane-quirk-for-mbp15-1.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ diff --git a/drivers/gpu/drm/i915/display/intel_quirks.c b/drivers/gpu/drm/i915/
3030
index 6e48d3bcdfec..a8c55e165b46 100644
3131
--- a/drivers/gpu/drm/i915/display/intel_quirks.c
3232
+++ b/drivers/gpu/drm/i915/display/intel_quirks.c
33-
@@ -59,6 +59,18 @@ static void quirk_increase_ddi_disabled_time(struct drm_i915_private *i915)
34-
drm_info(&i915->drm, "Applying Increase DDI Disabled quirk\n");
33+
@@ -59,6 +59,18 @@ static void quirk_increase_ddi_disabled_time(struct intel_display *display)
34+
drm_info(display->drm, "Applying Increase DDI Disabled quirk\n");
3535
}
3636

3737
+/*
@@ -40,15 +40,15 @@ index 6e48d3bcdfec..a8c55e165b46 100644
4040
+ * quirk is used to force it as otherwise it might not be possible to compute a
4141
+ * valid link configuration.
4242
+ */
43-
+static void quirk_ddi_a_force_4_lanes(struct drm_i915_private *i915)
43+
+static void quirk_ddi_a_force_4_lanes(struct intel_display *display)
4444
+{
45-
+ intel_set_quirk(i915, QUIRK_DDI_A_FORCE_4_LANES);
46-
+ drm_info(&i915->drm, "Applying DDI A Forced 4 Lanes quirk\n");
45+
+ intel_set_quirk(display, QUIRK_DDI_A_FORCE_4_LANES);
46+
+ drm_info(display->drm, "Applying DDI A Forced 4 Lanes quirk\n");
4747
+}
4848
+
49-
static void quirk_no_pps_backlight_power_hook(struct drm_i915_private *i915)
49+
static void quirk_no_pps_backlight_power_hook(struct intel_display *display)
5050
{
51-
intel_set_quirk(i915, QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK);
51+
intel_set_quirk(display, QUIRK_NO_PPS_BACKLIGHT_POWER_HOOK);
5252
@@ -199,6 +211,9 @@ static struct intel_quirk intel_quirks[] = {
5353
{ 0x3184, 0x1019, 0xa94d, quirk_increase_ddi_disabled_time },
5454
/* HP Notebook - 14-r206nv */
@@ -58,7 +58,7 @@ index 6e48d3bcdfec..a8c55e165b46 100644
5858
+ { 0x3e9b, 0x106b, 0x0176, quirk_ddi_a_force_4_lanes },
5959
};
6060

61-
void intel_init_quirks(struct drm_i915_private *i915)
61+
void intel_init_quirks(struct intel_display *display)
6262
diff --git a/drivers/gpu/drm/i915/display/intel_quirks.h b/drivers/gpu/drm/i915/display/intel_quirks.h
6363
index 10a4d163149f..78aacf1f6f5c 100644
6464
--- a/drivers/gpu/drm/i915/display/intel_quirks.h
@@ -70,7 +70,7 @@ index 10a4d163149f..78aacf1f6f5c 100644
7070
+ QUIRK_DDI_A_FORCE_4_LANES,
7171
};
7272

73-
void intel_init_quirks(struct drm_i915_private *i915);
73+
void intel_init_quirks(struct intel_display *display);
7474
--
7575
2.39.1
7676

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
KVER=6.9.4
1+
KVER=6.10-rc5

0 commit comments

Comments
 (0)