From: Sasha Levin Date: Mon, 23 Oct 2023 12:56:50 +0000 (-0400) Subject: Drop drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch X-Git-Tag: v4.14.328~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e2d0f2b92b42892e4975585f8c15fb2d5f347ba;p=thirdparty%2Fkernel%2Fstable-queue.git Drop drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch b/queue-6.1/drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch deleted file mode 100644 index 383554a6c94..00000000000 --- a/queue-6.1/drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 323a3358bbee90c1ee3acd8eea03d8df3bb540d1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Sep 2023 15:00:11 -0700 -Subject: drm/panel: Move AUX B116XW03 out of panel-edp back to panel-simple - -From: Douglas Anderson - -[ Upstream commit ad3e33fe071dffea07279f96dab4f3773c430fe2 ] - -In commit 5f04e7ce392d ("drm/panel-edp: Split eDP panels out of -panel-simple") I moved a pile of panels out of panel-simple driver -into the newly created panel-edp driver. One of those panels, however, -shouldn't have been moved. - -As is clear from commit e35e305eff0f ("drm/panel: simple: Add AUO -B116XW03 panel support"), AUX B116XW03 is an LVDS panel. It's used in -exynos5250-snow and exynos5420-peach-pit where it's clear that the -panel is hooked up with LVDS. Furthermore, searching for datasheets I -found one that makes it clear that this panel is LVDS. - -As far as I can tell, I got confused because in commit 88d3457ceb82 -("drm/panel: auo,b116xw03: fix flash backlight when power on") Jitao -Shi added "DRM_MODE_CONNECTOR_eDP". That seems wrong. Looking at the -downstream ChromeOS trees, it seems like some Mediatek boards are -using a panel that they call "auo,b116xw03" that's an eDP panel. The -best I can guess is that they actually have a different panel that has -similar timing. If so then the proper panel should be used or they -should switch to the generic "edp-panel" compatible. - -When moving this back to panel-edp, I wasn't sure what to use for -.bus_flags and .bus_format and whether to add the extra "enable" delay -from commit 88d3457ceb82 ("drm/panel: auo,b116xw03: fix flash -backlight when power on"). I've added formats/flags/delays based on my -(inexpert) analysis of the datasheet. These are untested. - -NOTE: if/when this is backported to stable, we might run into some -trouble. Specifically, before 474c162878ba ("arm64: dts: mt8183: -jacuzzi: Move panel under aux-bus") this panel was used by -"mt8183-kukui-jacuzzi", which assumed it was an eDP panel. I don't -know what to suggest for that other than someone making up a bogus -panel for jacuzzi that's just for the stable channel. - -Fixes: 88d3457ceb82 ("drm/panel: auo,b116xw03: fix flash backlight when power on") -Fixes: 5f04e7ce392d ("drm/panel-edp: Split eDP panels out of panel-simple") -Tested-by: Anton Bambura -Acked-by: Hsin-Yi Wang -Signed-off-by: Douglas Anderson -Link: https://patchwork.freedesktop.org/patch/msgid/20230925150010.1.Iff672233861bcc4cf25a7ad0a81308adc3bda8a4@changeid -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/panel/panel-edp.c | 29 ----------------------- - drivers/gpu/drm/panel/panel-simple.c | 35 ++++++++++++++++++++++++++++ - 2 files changed, 35 insertions(+), 29 deletions(-) - -diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c -index a163585a2a52b..2d22de9322281 100644 ---- a/drivers/gpu/drm/panel/panel-edp.c -+++ b/drivers/gpu/drm/panel/panel-edp.c -@@ -978,32 +978,6 @@ static const struct panel_desc auo_b116xak01 = { - }, - }; - --static const struct drm_display_mode auo_b116xw03_mode = { -- .clock = 70589, -- .hdisplay = 1366, -- .hsync_start = 1366 + 40, -- .hsync_end = 1366 + 40 + 40, -- .htotal = 1366 + 40 + 40 + 32, -- .vdisplay = 768, -- .vsync_start = 768 + 10, -- .vsync_end = 768 + 10 + 12, -- .vtotal = 768 + 10 + 12 + 6, -- .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, --}; -- --static const struct panel_desc auo_b116xw03 = { -- .modes = &auo_b116xw03_mode, -- .num_modes = 1, -- .bpc = 6, -- .size = { -- .width = 256, -- .height = 144, -- }, -- .delay = { -- .enable = 400, -- }, --}; -- - static const struct drm_display_mode auo_b133han05_mode = { - .clock = 142600, - .hdisplay = 1920, -@@ -1727,9 +1701,6 @@ static const struct of_device_id platform_of_match[] = { - }, { - .compatible = "auo,b116xa01", - .data = &auo_b116xak01, -- }, { -- .compatible = "auo,b116xw03", -- .data = &auo_b116xw03, - }, { - .compatible = "auo,b133han05", - .data = &auo_b133han05, -diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 0e8622ccd3a0f..00bb34c51d0cb 100644 ---- a/drivers/gpu/drm/panel/panel-simple.c -+++ b/drivers/gpu/drm/panel/panel-simple.c -@@ -893,6 +893,38 @@ static const struct panel_desc auo_b101xtn01 = { - }, - }; - -+static const struct drm_display_mode auo_b116xw03_mode = { -+ .clock = 70589, -+ .hdisplay = 1366, -+ .hsync_start = 1366 + 40, -+ .hsync_end = 1366 + 40 + 40, -+ .htotal = 1366 + 40 + 40 + 32, -+ .vdisplay = 768, -+ .vsync_start = 768 + 10, -+ .vsync_end = 768 + 10 + 12, -+ .vtotal = 768 + 10 + 12 + 6, -+ .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, -+}; -+ -+static const struct panel_desc auo_b116xw03 = { -+ .modes = &auo_b116xw03_mode, -+ .num_modes = 1, -+ .bpc = 6, -+ .size = { -+ .width = 256, -+ .height = 144, -+ }, -+ .delay = { -+ .prepare = 1, -+ .enable = 200, -+ .disable = 200, -+ .unprepare = 500, -+ }, -+ .bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG, -+ .bus_flags = DRM_BUS_FLAG_DE_HIGH, -+ .connector_type = DRM_MODE_CONNECTOR_LVDS, -+}; -+ - static const struct display_timing auo_g070vvn01_timings = { - .pixelclock = { 33300000, 34209000, 45000000 }, - .hactive = { 800, 800, 800 }, -@@ -3952,6 +3984,9 @@ static const struct of_device_id platform_of_match[] = { - }, { - .compatible = "auo,b101xtn01", - .data = &auo_b101xtn01, -+ }, { -+ .compatible = "auo,b116xw03", -+ .data = &auo_b116xw03, - }, { - .compatible = "auo,g070vvn01", - .data = &auo_g070vvn01, --- -2.42.0 - diff --git a/queue-6.1/series b/queue-6.1/series index aaa8f424dd5..cf4631aa957 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -177,7 +177,6 @@ platform-x86-asus-wmi-map-0x2a-code-ignore-0x2b-and-0x2c-events.patch gpio-vf610-set-value-before-the-direction-to-avoid-a-glitch.patch asoc-pxa-fix-a-memory-leak-in-probe.patch drm-bridge-ti-sn65dsi86-associate-dsi-device-lifetim.patch -drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch serial-8250-omap-move-uart_write-inside-pm-section.patch serial-8250-omap-convert-to-modern-pm-ops.patch kallsyms-reduce-the-memory-occupied-by-kallsyms_seqs.patch diff --git a/queue-6.5/drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch b/queue-6.5/drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch deleted file mode 100644 index f1a9ed4b5c0..00000000000 --- a/queue-6.5/drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 6b652224b09cdbcf5dfd0ccbc2a81779f81e3709 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Sep 2023 15:00:11 -0700 -Subject: drm/panel: Move AUX B116XW03 out of panel-edp back to panel-simple - -From: Douglas Anderson - -[ Upstream commit ad3e33fe071dffea07279f96dab4f3773c430fe2 ] - -In commit 5f04e7ce392d ("drm/panel-edp: Split eDP panels out of -panel-simple") I moved a pile of panels out of panel-simple driver -into the newly created panel-edp driver. One of those panels, however, -shouldn't have been moved. - -As is clear from commit e35e305eff0f ("drm/panel: simple: Add AUO -B116XW03 panel support"), AUX B116XW03 is an LVDS panel. It's used in -exynos5250-snow and exynos5420-peach-pit where it's clear that the -panel is hooked up with LVDS. Furthermore, searching for datasheets I -found one that makes it clear that this panel is LVDS. - -As far as I can tell, I got confused because in commit 88d3457ceb82 -("drm/panel: auo,b116xw03: fix flash backlight when power on") Jitao -Shi added "DRM_MODE_CONNECTOR_eDP". That seems wrong. Looking at the -downstream ChromeOS trees, it seems like some Mediatek boards are -using a panel that they call "auo,b116xw03" that's an eDP panel. The -best I can guess is that they actually have a different panel that has -similar timing. If so then the proper panel should be used or they -should switch to the generic "edp-panel" compatible. - -When moving this back to panel-edp, I wasn't sure what to use for -.bus_flags and .bus_format and whether to add the extra "enable" delay -from commit 88d3457ceb82 ("drm/panel: auo,b116xw03: fix flash -backlight when power on"). I've added formats/flags/delays based on my -(inexpert) analysis of the datasheet. These are untested. - -NOTE: if/when this is backported to stable, we might run into some -trouble. Specifically, before 474c162878ba ("arm64: dts: mt8183: -jacuzzi: Move panel under aux-bus") this panel was used by -"mt8183-kukui-jacuzzi", which assumed it was an eDP panel. I don't -know what to suggest for that other than someone making up a bogus -panel for jacuzzi that's just for the stable channel. - -Fixes: 88d3457ceb82 ("drm/panel: auo,b116xw03: fix flash backlight when power on") -Fixes: 5f04e7ce392d ("drm/panel-edp: Split eDP panels out of panel-simple") -Tested-by: Anton Bambura -Acked-by: Hsin-Yi Wang -Signed-off-by: Douglas Anderson -Link: https://patchwork.freedesktop.org/patch/msgid/20230925150010.1.Iff672233861bcc4cf25a7ad0a81308adc3bda8a4@changeid -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/panel/panel-edp.c | 29 ----------------------- - drivers/gpu/drm/panel/panel-simple.c | 35 ++++++++++++++++++++++++++++ - 2 files changed, 35 insertions(+), 29 deletions(-) - -diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c -index fbd114b4f0be0..856f73a46ee61 100644 ---- a/drivers/gpu/drm/panel/panel-edp.c -+++ b/drivers/gpu/drm/panel/panel-edp.c -@@ -976,32 +976,6 @@ static const struct panel_desc auo_b116xak01 = { - }, - }; - --static const struct drm_display_mode auo_b116xw03_mode = { -- .clock = 70589, -- .hdisplay = 1366, -- .hsync_start = 1366 + 40, -- .hsync_end = 1366 + 40 + 40, -- .htotal = 1366 + 40 + 40 + 32, -- .vdisplay = 768, -- .vsync_start = 768 + 10, -- .vsync_end = 768 + 10 + 12, -- .vtotal = 768 + 10 + 12 + 6, -- .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, --}; -- --static const struct panel_desc auo_b116xw03 = { -- .modes = &auo_b116xw03_mode, -- .num_modes = 1, -- .bpc = 6, -- .size = { -- .width = 256, -- .height = 144, -- }, -- .delay = { -- .enable = 400, -- }, --}; -- - static const struct drm_display_mode auo_b133han05_mode = { - .clock = 142600, - .hdisplay = 1920, -@@ -1725,9 +1699,6 @@ static const struct of_device_id platform_of_match[] = { - }, { - .compatible = "auo,b116xa01", - .data = &auo_b116xak01, -- }, { -- .compatible = "auo,b116xw03", -- .data = &auo_b116xw03, - }, { - .compatible = "auo,b133han05", - .data = &auo_b133han05, -diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 03196fbfa4d79..e26af5e1299a8 100644 ---- a/drivers/gpu/drm/panel/panel-simple.c -+++ b/drivers/gpu/drm/panel/panel-simple.c -@@ -923,6 +923,38 @@ static const struct panel_desc auo_b101xtn01 = { - }, - }; - -+static const struct drm_display_mode auo_b116xw03_mode = { -+ .clock = 70589, -+ .hdisplay = 1366, -+ .hsync_start = 1366 + 40, -+ .hsync_end = 1366 + 40 + 40, -+ .htotal = 1366 + 40 + 40 + 32, -+ .vdisplay = 768, -+ .vsync_start = 768 + 10, -+ .vsync_end = 768 + 10 + 12, -+ .vtotal = 768 + 10 + 12 + 6, -+ .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, -+}; -+ -+static const struct panel_desc auo_b116xw03 = { -+ .modes = &auo_b116xw03_mode, -+ .num_modes = 1, -+ .bpc = 6, -+ .size = { -+ .width = 256, -+ .height = 144, -+ }, -+ .delay = { -+ .prepare = 1, -+ .enable = 200, -+ .disable = 200, -+ .unprepare = 500, -+ }, -+ .bus_format = MEDIA_BUS_FMT_RGB666_1X7X3_SPWG, -+ .bus_flags = DRM_BUS_FLAG_DE_HIGH, -+ .connector_type = DRM_MODE_CONNECTOR_LVDS, -+}; -+ - static const struct display_timing auo_g070vvn01_timings = { - .pixelclock = { 33300000, 34209000, 45000000 }, - .hactive = { 800, 800, 800 }, -@@ -4074,6 +4106,9 @@ static const struct of_device_id platform_of_match[] = { - }, { - .compatible = "auo,b101xtn01", - .data = &auo_b101xtn01, -+ }, { -+ .compatible = "auo,b116xw03", -+ .data = &auo_b116xw03, - }, { - .compatible = "auo,g070vvn01", - .data = &auo_g070vvn01, --- -2.42.0 - diff --git a/queue-6.5/series b/queue-6.5/series index df0cf13f79e..39ff780fbcc 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -216,7 +216,6 @@ asoc-cs35l56-fix-illegal-use-of-init_completion.patch asoc-pxa-fix-a-memory-leak-in-probe.patch asoc-cs42l42-fix-missing-include-of-gpio-consumer.h.patch drm-bridge-ti-sn65dsi86-associate-dsi-device-lifetim.patch -drm-panel-move-aux-b116xw03-out-of-panel-edp-back-to.patch drm-i915-cx0-only-clear-set-the-pipe-reset-bit-of-th.patch drm-amdgpu-fix-possible-null-pointer-dereference.patch powerpc-mm-allow-arch_force_max_order-up-to-12.patch