Merge tag 'drm-msm-fixes-2023-11-21' of https://gitlab.freedesktop.org/drm/msm into...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / msm / msm_drv.c

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 443bbc3ed75089110ef9f17f014e99be5209ff60..3f217b57829347413a5e570ba3441fc758e915ae 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -265,7 +265,9 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
        if (ret)
                goto err_deinit_vram;
 
-       msm_gem_shrinker_init(ddev);
+       ret = msm_gem_shrinker_init(ddev);
+       if (ret)
+               goto err_msm_uninit;
 
        if (priv->kms_init) {
                ret = msm_drm_kms_init(dev, drv);
@@ -286,8 +288,6 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
        if (ret)
                goto err_msm_uninit;
 
-       drm_kms_helper_poll_init(ddev);
-
        if (priv->kms_init) {
                drm_kms_helper_poll_init(ddev);
                msm_fbdev_setup(ddev);