niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/msm/mdp5: stop overriding drvdata

Browse source 
The rest of the code expects that master's device drvdata is the
struct msm_drm_private instance. Do not override the mdp5's drvdata.

Fixes: 6874f48bb8 ("drm/msm: make mdp5/dpu devices master components")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/508334/
Link: https://lore.kernel.org/r/20221024152642.3213488-1-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
This commit is contained in:
Dmitry Baryshkov 2022-10-24 18:26:42 +03:00
parent 9a5c1586e8
commit c6122688f2
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
View file

@ -203,7 +203,7 @@ static int mdp5_set_split_display(struct msm_kms *kms,
slave_encoder); slave_encoder);
} }
static void mdp5_destroy(struct platform_device *pdev); static void mdp5_destroy(struct mdp5_kms *mdp5_kms);
static void mdp5_kms_destroy(struct msm_kms *kms) static void mdp5_kms_destroy(struct msm_kms *kms)
{ {
@ -223,7 +223,7 @@ static void mdp5_kms_destroy(struct msm_kms *kms)
} }
mdp_kms_destroy(&mdp5_kms->base); mdp_kms_destroy(&mdp5_kms->base);
mdp5_destroy(mdp5_kms->pdev); mdp5_destroy(mdp5_kms);
} }
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
@ -519,9 +519,10 @@ static void read_mdp_hw_revision(struct mdp5_kms *mdp5_kms,
struct device *dev = &mdp5_kms->pdev->dev; struct device *dev = &mdp5_kms->pdev->dev;
u32 version; u32 version;
pm_runtime_get_sync(dev); /* Manually enable the MDP5, as pm runtime isn't usable yet. */
mdp5_enable(mdp5_kms);
version = mdp5_read(mdp5_kms, REG_MDP5_HW_VERSION); version = mdp5_read(mdp5_kms, REG_MDP5_HW_VERSION);
pm_runtime_put_sync(dev); mdp5_disable(mdp5_kms);
*major = FIELD(version, MDP5_HW_VERSION_MAJOR); *major = FIELD(version, MDP5_HW_VERSION_MAJOR);
*minor = FIELD(version, MDP5_HW_VERSION_MINOR); *minor = FIELD(version, MDP5_HW_VERSION_MINOR);
@ -559,6 +560,8 @@ static int mdp5_kms_init(struct drm_device *dev)
int irq, i, ret; int irq, i, ret;
ret = mdp5_init(to_platform_device(dev->dev), dev); ret = mdp5_init(to_platform_device(dev->dev), dev);
if (ret)
return ret;
/* priv->kms would have been populated by the MDP5 driver */ /* priv->kms would have been populated by the MDP5 driver */
kms = priv->kms; kms = priv->kms;
@ -632,9 +635,8 @@ fail:
return ret; return ret;
} }
static void mdp5_destroy(struct platform_device *pdev) static void mdp5_destroy(struct mdp5_kms *mdp5_kms)
{ {
struct mdp5_kms *mdp5_kms = platform_get_drvdata(pdev);
int i; int i;
if (mdp5_kms->ctlm) if (mdp5_kms->ctlm)
@ -648,7 +650,7 @@ static void mdp5_destroy(struct platform_device *pdev)
kfree(mdp5_kms->intfs[i]); kfree(mdp5_kms->intfs[i]);
if (mdp5_kms->rpm_enabled) if (mdp5_kms->rpm_enabled)
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&mdp5_kms->pdev->dev);
drm_atomic_private_obj_fini(&mdp5_kms->glob_state); drm_atomic_private_obj_fini(&mdp5_kms->glob_state);
drm_modeset_lock_fini(&mdp5_kms->glob_state_lock); drm_modeset_lock_fini(&mdp5_kms->glob_state_lock);
@ -797,8 +799,6 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev)
goto fail; goto fail;
} }
platform_set_drvdata(pdev, mdp5_kms);
spin_lock_init(&mdp5_kms->resource_lock); spin_lock_init(&mdp5_kms->resource_lock);
mdp5_kms->dev = dev; mdp5_kms->dev = dev;
@ -839,9 +839,6 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev)
*/ */
clk_set_rate(mdp5_kms->core_clk, 200000000); clk_set_rate(mdp5_kms->core_clk, 200000000);
pm_runtime_enable(&pdev->dev);
mdp5_kms->rpm_enabled = true;
read_mdp_hw_revision(mdp5_kms, &major, &minor); read_mdp_hw_revision(mdp5_kms, &major, &minor);
mdp5_kms->cfg = mdp5_cfg_init(mdp5_kms, major, minor); mdp5_kms->cfg = mdp5_cfg_init(mdp5_kms, major, minor);
@ -893,10 +890,13 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev)
/* set uninit-ed kms */ /* set uninit-ed kms */
priv->kms = &mdp5_kms->base.base; priv->kms = &mdp5_kms->base.base;
pm_runtime_enable(&pdev->dev);
mdp5_kms->rpm_enabled = true;
return 0; return 0;
fail: fail:
if (mdp5_kms) if (mdp5_kms)
mdp5_destroy(pdev); mdp5_destroy(mdp5_kms);
return ret; return ret;
} }
@ -953,7 +953,8 @@ static int mdp5_dev_remove(struct platform_device *pdev)
static __maybe_unused int mdp5_runtime_suspend(struct device *dev) static __maybe_unused int mdp5_runtime_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct mdp5_kms *mdp5_kms = platform_get_drvdata(pdev); struct msm_drm_private *priv = platform_get_drvdata(pdev);
struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms));
DBG(""); DBG("");
@ -963,7 +964,8 @@ static __maybe_unused int mdp5_runtime_suspend(struct device *dev)
static __maybe_unused int mdp5_runtime_resume(struct device *dev) static __maybe_unused int mdp5_runtime_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct mdp5_kms *mdp5_kms = platform_get_drvdata(pdev); struct msm_drm_private *priv = platform_get_drvdata(pdev);
struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms));
DBG(""); DBG("");