All the kms drivers now undo their own failures in kms_init() and have folded their hardware setup into it.
Drop ->hw_init(), call ->destroy() only for a KMS which was initialised successfully, and remove the flag which let the drivers opt in to that one at a time, as well as the handling of a half torn down KMS in msm_kms_destroy(). Assisted-by: LLM Signed-off-by: Dmitry Baryshkov <[email protected]> --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 -- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 1 - drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 -- drivers/gpu/drm/msm/msm_atomic.c | 1 - drivers/gpu/drm/msm/msm_kms.c | 16 ++-------------- drivers/gpu/drm/msm/msm_kms.h | 10 +--------- 6 files changed, 3 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 255beb83fc94..65ba8fa697e9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1290,8 +1290,6 @@ static int dpu_kms_init(struct drm_device *ddev) int ret = 0; unsigned long max_freq = ULONG_MAX; - dpu_kms->base.init_unwinds = true; - opp = dev_pm_opp_find_freq_floor(dev, &max_freq); if (!IS_ERR(opp)) dev_pm_opp_put(opp); diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index 8e51305f8dde..62a79bdfca19 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -394,7 +394,6 @@ static int mdp4_kms_init(struct drm_device *dev) /* TODO: Chips that aren't apq8064 have a 200 Mhz max_clk */ max_clk = 266667000; - priv->kms->init_unwinds = true; mdp4_kms->dev = dev; ret = mdp_kms_init(&mdp4_kms->base, &kms_funcs); diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 8fc8cdcf7d8c..80bb6ac56618 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -504,8 +504,6 @@ static int mdp5_kms_init(struct drm_device *dev) struct drm_gpuvm *vm; int i, ret; - kms->init_unwinds = true; - ret = mdp5_init(to_platform_device(dev->dev), dev); if (ret) return ret; diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index c26b0c7acdfa..a8babf1dbe0d 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -134,7 +134,6 @@ void msm_atomic_destroy_pending_timer(struct msm_pending_timer *timer) { if (timer->worker) kthread_destroy_worker(timer->worker); - timer->worker = NULL; } static bool can_do_async(struct drm_atomic_commit *state, diff --git a/drivers/gpu/drm/msm/msm_kms.c b/drivers/gpu/drm/msm/msm_kms.c index f65774b04c6f..7e1df472592d 100644 --- a/drivers/gpu/drm/msm/msm_kms.c +++ b/drivers/gpu/drm/msm/msm_kms.c @@ -295,17 +295,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv) ret = priv->kms_init(ddev); if (ret) { DRM_DEV_ERROR(dev, "failed to load kms\n"); - if (kms->init_unwinds) - goto err_destroy_snapshot; - goto err_destroy_kms; - } - - if (kms->funcs->hw_init) { - ret = kms->funcs->hw_init(kms); - if (ret) { - DRM_DEV_ERROR(dev, "kms hw init failed: %d\n", ret); - goto err_destroy_kms; - } + goto err_destroy_snapshot; } drm_helper_move_panel_connectors_to_head(ddev); @@ -347,9 +337,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv) err_destroy_event_threads: msm_drm_kms_destroy_event_threads(kms); -err_destroy_kms: - if (kms->funcs) - kms->funcs->destroy(kms); + kms->funcs->destroy(kms); err_destroy_snapshot: msm_disp_snapshot_destroy(ddev); diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index 2f097e23e2e9..517622367cc0 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -23,8 +23,6 @@ * for constructing the appropriate planes/crtcs/encoders/connectors. */ struct msm_kms_funcs { - /* hw initialization: */ - int (*hw_init)(struct msm_kms *kms); /* irq handling: */ void (*irq_preinstall)(struct msm_kms *kms); int (*irq_postinstall)(struct msm_kms *kms); @@ -149,9 +147,6 @@ struct msm_kms { int irq; bool irq_requested; - /* set by the kms drivers whose kms_init() undoes its own failures */ - bool init_unwinds; - /* rate limit the snapshot capture to once per attach */ atomic_t fault_snapshot_capture; @@ -202,7 +197,6 @@ static inline int msm_kms_init(struct msm_kms *kms, while (i--) msm_atomic_destroy_pending_timer(&kms->pending_timers[i]); destroy_workqueue(kms->wq); - kms->wq = NULL; return ret; } @@ -214,9 +208,7 @@ static inline void msm_kms_destroy(struct msm_kms *kms) for (i = 0; i < ARRAY_SIZE(kms->pending_timers); i++) msm_atomic_destroy_pending_timer(&kms->pending_timers[i]); - /* the kms drivers' ->destroy() also runs after a failed init */ - if (kms->wq) - destroy_workqueue(kms->wq); + destroy_workqueue(kms->wq); } #define for_each_crtc_mask(dev, crtc, crtc_mask) \ -- 2.47.3
