Skip to content

Commit eb028cd

Browse files
lumagsuperna9999
authored andcommitted
drm/bridge: panel: move prepare_prev_first handling to drm_panel_bridge_add_typed
The commit 5ea6b17 ("drm/panel: Add prepare_prev_first flag to drm_panel") and commit 0974687 ("drm/bridge: panel: Set pre_enable_prev_first from drmm_panel_bridge_add") added handling of panel's prepare_prev_first to devm_panel_bridge_add() and drmm_panel_bridge_add(). However if the driver calls drm_panel_bridge_add_typed() directly, then the flag won't be handled and thus the drm_bridge.pre_enable_prev_first will not be set. Move prepare_prev_first handling to the drm_panel_bridge_add_typed() so that there is no way to miss the flag. Fixes: 5ea6b17 ("drm/panel: Add prepare_prev_first flag to drm_panel") Fixes: 0974687 ("drm/bridge: panel: Set pre_enable_prev_first from drmm_panel_bridge_add") Reported-by: Svyatoslav Ryhel <[email protected]> Closes: https://lore.kernel.org/dri-devel/CAPVz0n3YZass3Bns1m0XrFxtAC0DKbEPiW6vXimQx97G243sXw@mail.gmail.com/ Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 97e000a commit eb028cd

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/gpu/drm/bridge/panel.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ struct drm_bridge *drm_panel_bridge_add_typed(struct drm_panel *panel,
299299
panel_bridge->bridge.of_node = panel->dev->of_node;
300300
panel_bridge->bridge.ops = DRM_BRIDGE_OP_MODES;
301301
panel_bridge->bridge.type = connector_type;
302+
panel_bridge->bridge.pre_enable_prev_first = panel->prepare_prev_first;
302303

303304
drm_bridge_add(&panel_bridge->bridge);
304305

@@ -413,8 +414,6 @@ struct drm_bridge *devm_drm_panel_bridge_add_typed(struct device *dev,
413414
return bridge;
414415
}
415416

416-
bridge->pre_enable_prev_first = panel->prepare_prev_first;
417-
418417
*ptr = bridge;
419418
devres_add(dev, ptr);
420419

@@ -456,8 +455,6 @@ struct drm_bridge *drmm_panel_bridge_add(struct drm_device *drm,
456455
if (ret)
457456
return ERR_PTR(ret);
458457

459-
bridge->pre_enable_prev_first = panel->prepare_prev_first;
460-
461458
return bridge;
462459
}
463460
EXPORT_SYMBOL(drmm_panel_bridge_add);

0 commit comments

Comments
 (0)