Patch "drm/bridge: Fix lvds-encoder since the panel_bridge rework." has been added to the 4.14-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
drm/bridge: Fix lvds-encoder since the panel_bridge rework.
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-bridge-fix-lvds-encoder-since-the-panel_bridge-rework.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Thu Feb 1 13:45:42 CET 2018
From: Eric Anholt <[email protected]>
Date: Tue, 14 Nov 2017 11:16:47 -0800
Subject: drm/bridge: Fix lvds-encoder since the panel_bridge rework.
From: Eric Anholt <[email protected]>
[ Upstream commit dbb58bfd9ae6c885b2ca001a9a5ab8b881fb4ba9 ]
The panel_bridge bridge attaches to the panel's OF node, not the lvds-encoder's node. Put in a little no-op bridge of our own so that our consumers can still find a bridge where they expect.
This also fixes an unintended unregistration and leak of the panel-bridge on module remove.
dge.")
--- drivers/gpu/drm/bridge/lvds-encoder.c | 48 +++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 7 deletions(-)
drivers/gpu/drm/bridge/lvds-encoder.c +41 -7
@@ -13,13 +13,37 @@#include <linux/of_graph.h> +struct lvds_encoder { +struct drm_bridge bridge; +struct drm_bridge *panel_bridge; +}; + +static int lvds_encoder_attach (struct drm_bridge *bridge) +{ +struct lvds_encoder *lvds_encoder =container_of (bridge, + struct lvds_encoder, + bridge); + +return drm_bridge_attach (bridge->encoder, lvds_encoder->panel_bridge, + bridge); +} + +static struct drm_bridge_funcs funcs = { + .attach = lvds_encoder_attach, +}; +static int lvds_encoder_probe (struct platform_device *pdev) {struct device_node *port;struct device_node *endpoint;struct device_node *panel_node;struct drm_panel *panel; -struct drm_bridge *bridge; +struct lvds_encoder *lvds_encoder; + + lvds_encoder =devm_kzalloc (&pdev->dev,sizeof (*lvds_encoder), +GFP_KERNEL ); +if (!lvds_encoder) +return -ENOMEM ;/* Locate the panel DT node. */ port =of_graph_get_port_by_id (pdev->dev.of_node,1 );
@@ -49,20 +73,30 @@ static int lvds_encoder_probe(struct plareturn -EPROBE_DEFER ; } - bridge =drm_panel_bridge_add (panel,DRM_MODE_CONNECTOR_LVDS ); -if (IS_ERR (bridge)) -return PTR_ERR (bridge); + lvds_encoder->panel_bridge = +devm_drm_panel_bridge_add (&pdev->dev, + panel,DRM_MODE_CONNECTOR_LVDS ); +if (IS_ERR (lvds_encoder->panel_bridge)) +return PTR_ERR (lvds_encoder->panel_bridge); + +/* The panel_bridge bridge is attached to the panel's of_node, +* but we need a bridge attached to our of_node for our user +* to look up. +*/ + lvds_encoder->bridge.of_node = pdev->dev.of_node; + lvds_encoder->bridge.funcs = &funcs; +drm_bridge_add (&lvds_encoder->bridge); -platform_set_drvdata (pdev, bridge); +platform_set_drvdata (pdev, lvds_encoder);return 0 ; }static int lvds_encoder_remove (struct platform_device *pdev) { -struct drm_bridge *bridge =platform_get_drvdata (pdev); +struct lvds_encoder *lvds_encoder =platform_get_drvdata (pdev); -drm_bridge_remove (bridge); +drm_bridge_remove (&lvds_encoder->bridge);return 0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/drm-bridge-fix-lvds-encoder-since-the-panel_bridge-rework.patch queue-4.14/drm-vc4-move-irq-enable-to-pm-path.patch queue-4.14/drm-vc4-account-for-interrupts-in-flight.patch