提交 0245302f 编写于 作者: D David Heidelberg 提交者: Zheng Zengkai

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

stable inclusion
from stable-5.10.67
commit 84cac4f80605e023d3b6febb9adc520b236a3d17
bugzilla: 182619 https://gitee.com/openeuler/kernel/issues/I4EWO7

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=84cac4f80605e023d3b6febb9adc520b236a3d17

--------------------------------

commit cb0927ab 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: NDavid Heidelberg <david@ixit.cz>
Link: https://lore.kernel.org/r/20210811170631.39296-1-david@ixit.czSigned-off-by: NRob Clark <robdclark@chromium.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NWeilong Chen <chenweilong@huawei.com>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 08b3548a
...@@ -397,6 +397,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) ...@@ -397,6 +397,7 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev->dev); struct platform_device *pdev = to_platform_device(dev->dev);
struct mdp4_platform_config *config = mdp4_get_config(pdev); struct mdp4_platform_config *config = mdp4_get_config(pdev);
struct msm_drm_private *priv = dev->dev_private;
struct mdp4_kms *mdp4_kms; struct mdp4_kms *mdp4_kms;
struct msm_kms *kms = NULL; struct msm_kms *kms = NULL;
struct msm_gem_address_space *aspace; struct msm_gem_address_space *aspace;
...@@ -412,7 +413,8 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) ...@@ -412,7 +413,8 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev)
mdp_kms_init(&mdp4_kms->base, &kms_funcs); 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; mdp4_kms->dev = dev;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册