I will drop this patch since the problem had been fixed by Dmitry Baryshkov patch.
https://gitlab.freedesktop.org/drm/msm/-/commit/577e2a9dfc8fba7938aaf75db63f...
On 6/3/2022 2:28 PM, Kuogee Hsieh wrote:
At msm initialize phase, msm_drm_init() is called to initialize modules sequentially. It will call msm_drm_uninit() to clean up initialized phase if any module initialization return failed. This patch move msm_irq_install() to the last step of msm_drm_init() after all modules are initialized successfully so that no msm_irq_unistall() required at msm_drm_uninit() if any module initialization failed happen at msm_drm_init().
Signed-off-by: Kuogee Hsieh quic_khsieh@quicinc.com
drivers/gpu/drm/msm/msm_drv.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 6665c5a..ab42e9a 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -132,15 +132,6 @@ static int msm_irq_install(struct drm_device *dev, unsigned int irq) return 0; }
-static void msm_irq_uninstall(struct drm_device *dev) -{
- struct msm_drm_private *priv = dev->dev_private;
- struct msm_kms *kms = priv->kms;
- kms->funcs->irq_uninstall(kms);
- free_irq(kms->irq, dev);
-}
- struct msm_vblank_work { struct work_struct work; int crtc_id;
@@ -232,10 +223,6 @@ static int msm_drm_uninit(struct device *dev)
drm_mode_config_cleanup(ddev);
- pm_runtime_get_sync(dev);
- msm_irq_uninstall(ddev);
- pm_runtime_put_sync(dev);
- if (kms && kms->funcs) kms->funcs->destroy(kms);
@@ -437,16 +424,6 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) goto err_msm_uninit; }
- if (kms) {
pm_runtime_get_sync(dev);ret = msm_irq_install(ddev, kms->irq);pm_runtime_put_sync(dev);if (ret < 0) {DRM_DEV_ERROR(dev, "failed to install IRQ handler\n");goto err_msm_uninit;}- }
- ret = drm_dev_register(ddev, 0); if (ret) goto err_msm_uninit;
@@ -467,6 +444,12 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) if (ret) goto err_msm_uninit;
if (kms) {
pm_runtime_get_sync(dev);msm_irq_install(ddev, kms->irq);pm_runtime_put_sync(dev);}
drm_kms_helper_poll_init(ddev);
return 0;