From: Kevin Hao <[email protected]> Two similar commit ea4c35c84386 ("drm/bridge: Introduce pre_enable_upstream_first to alter bridge init order") and commit 5044e5f2511c ("drm/bridge: Introduce pre_enable_prev_first to alter bridge init order") were from SDK and stable respectively and provide almost the same function except the difference in the variable name. During the merge of stable kernel, we have chosen the implementation of the stable kernel. Beside that, we also need to change all the usage of panel_bridge::pre_enable_upstream_first to panel_bridge::pre_enable_prev_first.
Signed-off-by: Kevin Hao <[email protected]> --- Hi Bruce, Please help me merge this into the following two branches: v6.1/standard/bcm-2xxx-rpi v6.1/standard/preempt-rt/bcm-2xxx-rpi drivers/gpu/drm/bridge/panel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index 0c1dcf85ed13..ea2b3ba307bb 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -258,7 +258,7 @@ struct drm_bridge *drm_panel_bridge_add_typed(struct drm_panel *panel, panel_bridge->bridge.ops = DRM_BRIDGE_OP_MODES; panel_bridge->bridge.type = connector_type; - panel_bridge->bridge.pre_enable_upstream_first = + panel_bridge->bridge.pre_enable_prev_first = panel->prepare_upstream_first; drm_bridge_add(&panel_bridge->bridge); -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12898): https://lists.yoctoproject.org/g/linux-yocto/message/12898 Mute This Topic: https://lists.yoctoproject.org/mt/100385770/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
