On Thu, Sep 05, 2024 at 06:21:00AM +0200, Pascal Ernster wrote: > [2024-09-04 19:50] Sasha Levin: > > This is a note to let you know that I've just added the patch titled > > > > drm/drm-bridge: Drop conditionals around of_node pointers > > > > to the 6.6-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-drm-bridge-drop-conditionals-around-of_node-poin.patch > > and it can be found in the queue-6.6 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > > > commit 74f5f42c35daf9aedbc96283321c30fc591c634f > > Author: Sui Jingfeng <sui.jingfeng@xxxxxxxxx> > > Date: Wed May 8 02:00:00 2024 +0800 > > > > drm/drm-bridge: Drop conditionals around of_node pointers > > [ Upstream commit ad3323a6ccb7d43bbeeaa46d5311c43d5d361fc7 ] > > Having conditional around the of_node pointer of the drm_bridge structure > > is not necessary, since drm_bridge structure always has the of_node as its > > member. > > Let's drop the conditional to get a better looks, please also note that > > this is following the already accepted commitments. see commit d8dfccde2709 > > ("drm/bridge: Drop conditionals around of_node pointers") for reference. > > Signed-off-by: Sui Jingfeng <sui.jingfeng@xxxxxxxxx> > > Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx> > > Signed-off-by: Robert Foss <rfoss@xxxxxxxxxx> > > Link: https://patchwork.freedesktop.org/patch/msgid/20240507180001.1358816-1-sui.jingfeng@xxxxxxxxx > > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > > > diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c > > index 62d8a291c49c..70b05582e616 100644 > > --- a/drivers/gpu/drm/drm_bridge.c > > +++ b/drivers/gpu/drm/drm_bridge.c > > @@ -353,13 +353,8 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, > > bridge->encoder = NULL; > > list_del(&bridge->chain_node); > > -#ifdef CONFIG_OF > > DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n", > > bridge->of_node, encoder->name, ret); > > -#else > > - DRM_ERROR("failed to attach bridge to encoder %s: %d\n", > > - encoder->name, ret); > > -#endif > > return ret; > > } > > > Hi Sasha, > > > this breaks the x86_64 build for me. > > AFAICT this patch cannot work without commit > d8dfccde2709de4327c3d62b50e5dc012f08836f "drm/bridge: Drop conditionals > around of_node pointers", but that commit is only present in Linux >= 6.7. > > This issue affects the 6.6, 6.1 and 5.15 branches. Now dropped, thanks! greg k-h
