Skip to content

Commit cb0927a

Browse files
okiasrobclark
authored andcommitted
drm/msi/mdp4: populate priv->kms in mdp4_kms_init
Without this fix boot throws NULL ptr exception at msm_dsi_manager_setup_encoder on devices like Nexus 7 2013 (MDP4 v4.4). Fixes: 03436e3 ("drm/msm/dsi: Move setup_encoder to modeset_init") Cc: <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Rob Clark <[email protected]>
1 parent 858c595 commit cb0927a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
399399
{
400400
struct platform_device *pdev = to_platform_device(dev->dev);
401401
struct mdp4_platform_config *config = mdp4_get_config(pdev);
402+
struct msm_drm_private *priv = dev->dev_private;
402403
struct mdp4_kms *mdp4_kms;
403404
struct msm_kms *kms = NULL;
404405
struct msm_gem_address_space *aspace;
@@ -418,7 +419,8 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
418419
goto fail;
419420
}
420421

421-
kms = &mdp4_kms->base.base;
422+
priv->kms = &mdp4_kms->base.base;
423+
kms = priv->kms;
422424

423425
mdp4_kms->dev = dev;
424426

0 commit comments

Comments
 (0)