Skip to content

Commit 4d29f8f

Browse files
committed
ti: display
merge: beagleboard/linux#275 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
1 parent 1fdeb7e commit 4d29f8f

11 files changed

Lines changed: 191 additions & 551 deletions

patch.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -651,12 +651,6 @@ drivers () {
651651
dir 'edt-ft'
652652
dir 'panel-simple'
653653

654-
#git revert --no-edit 7879daab876bae9acc5468b6d9347b574ce178b6 -s
655-
#git revert --no-edit 089a2a23c12d8940e8b0459ca473b28877c3f301 -s
656-
#git revert --no-edit de3c3af242ae34519098deef095637cf138eb509 -s
657-
658-
dir 'drm-bridge-reverts'
659-
660654
dir 'drm-bridge'
661655

662656
dir 'tiam62x'
@@ -721,4 +715,4 @@ readme () {
721715
packaging
722716
readme
723717
echo "patch.sh ran successfully"
724-
#
718+
#

patches/defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5241,6 +5241,7 @@ CONFIG_DRM_TI_TPD12S015=y
52415241
CONFIG_DRM_CDNS_MHDP8546=y
52425242
CONFIG_DRM_CDNS_MHDP8546_J721E=y
52435243
CONFIG_DRM_CDNS_DSI=y
5244+
CONFIG_DRM_CDNS_DSI_J721E=y
52445245
CONFIG_DRM_DW_HDMI=m
52455246
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
52465247
# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 776ce2aa34061d92c404c5964afb6bfab65c1382 Mon Sep 17 00:00:00 2001
2+
From: Rahul T R <r-ravikumar@ti.com>
3+
Date: Tue, 15 Nov 2022 16:35:44 +0530
4+
Subject: [PATCH 3/3] drm/bridge: cdns-dsi: Fix issue with phy init
5+
6+
Phy is not being initialized after suspend resume. Fix this by setting
7+
phy_initialized flag to false in suspend callback
8+
9+
Upstream Link: https://lore.kernel.org/all/20221115083918.23192-1-r-ravikumar@ti.com/
10+
11+
Signed-off-by: Rahul T R <r-ravikumar@ti.com>
12+
---
13+
drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 1 +
14+
1 file changed, 1 insertion(+)
15+
16+
diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
17+
index cce51ee51dfd..aab961daf7c7 100644
18+
--- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
19+
+++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c
20+
@@ -754,6 +754,7 @@ static int __maybe_unused cdns_dsi_suspend(struct device *dev)
21+
clk_disable_unprepare(dsi->dsi_p_clk);
22+
reset_control_assert(dsi->dsi_p_rst);
23+
dsi->link_initialized = false;
24+
+ dsi->phy_initialized = false;
25+
return 0;
26+
}
27+
28+
--
29+
2.30.2
30+

patches/drm-bridge/0005-drm-bridge-cdns-dsi-Set-input-for-DPI0.patch

Lines changed: 0 additions & 53 deletions
This file was deleted.

patches/drm-bridge/0006-HACK-drm-bridge-cdns-dsi-Remove-PM-runtime-calls.patch

Lines changed: 0 additions & 107 deletions
This file was deleted.

patches/drm-bridge/0007-HACK-phy-cdns-dphy-DPHY-wrapper-related-changes.patch

Lines changed: 0 additions & 130 deletions
This file was deleted.

patches/git/BBDTBS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/db7deb36ee68fbcb20f8035871f7c7bb91f180cb
1+
BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/d1907cd4d9ccf6619dc240aeb97f980959b0085e

0 commit comments

Comments
 (0)