This is a note to let you know that I've just added the patch titled
drm/msi/mdp4: populate priv->kms in mdp4_kms_init
to the 5.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-msi-mdp4-populate-priv-kms-in-mdp4_kms_init.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From cb0927ab80d224c9074f53d1a55b087d12ec5a85 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david@xxxxxxx>
Date: Wed, 11 Aug 2021 19:06:31 +0200
Subject: drm/msi/mdp4: populate priv->kms in mdp4_kms_init
From: David Heidelberg <david@xxxxxxx>
commit cb0927ab80d224c9074f53d1a55b087d12ec5a85 upstream.
Without this fix boot throws NULL ptr exception at msm_dsi_manager_setup_encoder
on devices like Nexus 7 2013 (MDP4 v4.4).
Fixes: 03436e3ec69c ("drm/msm/dsi: Move setup_encoder to modeset_init")
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: David Heidelberg <david@xxxxxxx>
Link: https://lore.kernel.org/r/20210811170631.39296-1-david@xxxxxxx
Signed-off-by: Rob Clark <robdclark@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
@@ -399,6 +399,7 @@ struct msm_kms *mdp4_kms_init(struct drm
{
struct platform_device *pdev = to_platform_device(dev->dev);
struct mdp4_platform_config *config = mdp4_get_config(pdev);
+ struct msm_drm_private *priv = dev->dev_private;
struct mdp4_kms *mdp4_kms;
struct msm_kms *kms = NULL;
struct msm_gem_address_space *aspace;
@@ -418,7 +419,8 @@ struct msm_kms *mdp4_kms_init(struct drm
goto fail;
}
- kms = &mdp4_kms->base.base;
+ priv->kms = &mdp4_kms->base.base;
+ kms = priv->kms;
mdp4_kms->dev = dev;
Patches currently in stable-queue which might be from david@xxxxxxx are
queue-5.14/arm-9105-1-atags_to_fdt-don-t-warn-about-stack-size.patch
queue-5.14/drm-msm-mdp4-drop-vblank-get-put-from-prepare-comple.patch
queue-5.14/arm-dts-qcom-apq8064-correct-clock-names.patch
queue-5.14/drm-msi-mdp4-populate-priv-kms-in-mdp4_kms_init.patch
