| From 51a4cac7e1b6932191e4a17bc3ef046e82558907 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Jul 2021 13:13:55 -0500 |
| Subject: drm/ttm: Force re-init if ttm_global_init() fails |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Jason Ekstrand <jason@jlekstrand.net> |
| |
| [ Upstream commit 235c3610d5f02ee91244239b43cd9ae8b4859dff ] |
| |
| If we have a failure, decrement the reference count so that the next |
| call to ttm_global_init() will actually do something instead of assume |
| everything is all set up. |
| |
| Signed-off-by: Jason Ekstrand <jason@jlekstrand.net> |
| Fixes: 62b53b37e4b1 ("drm/ttm: use a static ttm_bo_global instance") |
| Reviewed-by: Christian König <christian.koenig@amd.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20210720181357.2760720-5-jason@jlekstrand.net |
| Signed-off-by: Christian König <christian.koenig@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/ttm/ttm_device.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c |
| index 3d9c62b93e29..ef6e0c042bb1 100644 |
| --- a/drivers/gpu/drm/ttm/ttm_device.c |
| +++ b/drivers/gpu/drm/ttm/ttm_device.c |
| @@ -100,6 +100,8 @@ static int ttm_global_init(void) |
| debugfs_create_atomic_t("buffer_objects", 0444, ttm_debugfs_root, |
| &glob->bo_count); |
| out: |
| + if (ret) |
| + --ttm_glob_use_count; |
| mutex_unlock(&ttm_global_mutex); |
| return ret; |
| } |
| -- |
| 2.30.2 |
| |
