The DPU, MDP4 and MDP5 drivers track whether they have enabled runtime PM, and MDP4 whether it has pinned its blank cursor, so that ->destroy() can tear down a KMS whose init failed half way. ->destroy() now only runs for a KMS which was initialised successfully, where both are always true.
Drop the flags and the checks. Assisted-by: LLM Signed-off-by: Dmitry Baryshkov <[email protected]> --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 +--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 - drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 7 ++----- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 2 -- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 5 +---- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 2 -- 6 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 2de4d881d13d..9756ebcce1b1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -916,8 +916,7 @@ static void dpu_kms_destroy(struct msm_kms *kms) msm_kms_destroy(&dpu_kms->base); - if (dpu_kms->rpm_enabled) - pm_runtime_disable(&dpu_kms->pdev->dev); + pm_runtime_disable(&dpu_kms->pdev->dev); } static int dpu_irq_postinstall(struct msm_kms *kms) @@ -1306,7 +1305,6 @@ static int dpu_kms_init(struct drm_device *ddev) dpu_kms->dev = ddev; pm_runtime_enable(&pdev->dev); - dpu_kms->rpm_enabled = true; ret = dpu_kms_hw_init(dpu_kms); if (ret) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h index e39831a397b1..769b8ce6332f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h @@ -87,7 +87,6 @@ struct dpu_kms { bool has_danger_ctrl; struct platform_device *pdev; - bool rpm_enabled; struct clk_bulk_data *clocks; size_t num_clocks; diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index 8529e7b2008d..daca49641811 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -128,14 +128,12 @@ static void mdp4_destroy(struct msm_kms *kms) struct mdp4_kms *mdp4_kms = to_mdp4_kms(to_mdp_kms(kms)); struct device *dev = mdp4_kms->dev->dev; - if (mdp4_kms->blank_cursor_iova) - msm_gem_unpin_iova(mdp4_kms->blank_cursor_bo, kms->vm); + msm_gem_unpin_iova(mdp4_kms->blank_cursor_bo, kms->vm); drm_gem_object_put(mdp4_kms->blank_cursor_bo); mdp4_destroy_vm(kms); - if (mdp4_kms->rpm_enabled) - pm_runtime_disable(dev); + pm_runtime_disable(dev); if (mdp4_kms->vdd) regulator_disable(mdp4_kms->vdd); @@ -438,7 +436,6 @@ static int mdp4_kms_init(struct drm_device *dev) } pm_runtime_enable(dev->dev); - mdp4_kms->rpm_enabled = true; /* make sure things are off before attaching iommu (bootloader could * have left things on, in which case we'll start getting faults if diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h index 06458d4ee48c..9dd829ec9401 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h @@ -34,8 +34,6 @@ struct mdp4_kms { struct mdp_irq error_handler; - bool rpm_enabled; - /* empty/blank cursor bo to use when cursor is "disabled" */ struct drm_gem_object *blank_cursor_bo; uint64_t blank_cursor_iova; diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 80bb6ac56618..af9ac108c06c 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -574,9 +574,7 @@ static int mdp5_kms_init(struct drm_device *dev) static void mdp5_destroy(struct mdp5_kms *mdp5_kms) { - if (mdp5_kms->rpm_enabled) - pm_runtime_disable(&mdp5_kms->pdev->dev); - + pm_runtime_disable(&mdp5_kms->pdev->dev); drm_atomic_private_obj_fini(&mdp5_kms->glob_state); } @@ -729,7 +727,6 @@ static int mdp5_init(struct platform_device *pdev, struct drm_device *dev) 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); diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h index 7bf2172fce0b..c0b163c4baa3 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h @@ -62,8 +62,6 @@ struct mdp5_kms { */ spinlock_t resource_lock; - bool rpm_enabled; - struct mdp_irq error_handler; int enable_count; -- 2.47.3
