Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7a936da authored by David Heidelberg's avatar David Heidelberg Committed by Greg Kroah-Hartman
Browse files

drm/msi/mdp4: populate priv->kms in mdp4_kms_init 



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: 03436e3e ("drm/msm/dsi: Move setup_encoder to modeset_init")

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDavid Heidelberg <david@ixit.cz>
Link: https://lore.kernel.org/r/20210811170631.39296-1-david@ixit.cz


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 90358cb0

drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c

+3 −1
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 
{

	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;
@@ -419,7 +420,8 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) 


	mdp_kms_init(&mdp4_kms->base, &kms_funcs);



	kms = &mdp4_kms->base.base;

	priv->kms = &mdp4_kms->base.base;

	kms = priv->kms;



	mdp4_kms->dev = dev;