diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2011-11-04 13:41:46 +0900 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2011-11-15 14:58:45 +0900 |
| commit | 84b46990cb2caf8efe20d5626e1d7e2e40bab832 (patch) | |
| tree | 60695d2dc83eacabce393d6f54e0d5ef1971ffe7 /drivers/gpu | |
| parent | 74ccc539bcebdb24afb74194223f92a96a7285ed (diff) | |
| download | lwn-84b46990cb2caf8efe20d5626e1d7e2e40bab832.tar.gz lwn-84b46990cb2caf8efe20d5626e1d7e2e40bab832.zip | |
drm/exynos: restored kernel_fb_list when reiniting fb_helper
during recreating exynos_drm_fbdev as a new display device probes,
fb_helper is reinitialized but kernel fb is not changed
so kernel_fb_list should be restored after fb_helper is reinitialized.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 1f4b3d1a7713..74092a81c180 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -405,6 +405,18 @@ int exynos_drm_fbdev_reinit(struct drm_device *dev) fb_helper = private->fb_helper; if (fb_helper) { + struct list_head temp_list; + + INIT_LIST_HEAD(&temp_list); + + /* + * fb_helper is reintialized but kernel fb is reused + * so kernel_fb_list need to be backuped and restored + */ + if (!list_empty(&fb_helper->kernel_fb_list)) + list_replace_init(&fb_helper->kernel_fb_list, + &temp_list); + drm_fb_helper_fini(fb_helper); ret = drm_fb_helper_init(dev, fb_helper, @@ -414,6 +426,9 @@ int exynos_drm_fbdev_reinit(struct drm_device *dev) return ret; } + if (!list_empty(&temp_list)) + list_replace(&temp_list, &fb_helper->kernel_fb_list); + ret = drm_fb_helper_single_add_all_connectors(fb_helper); if (ret < 0) { DRM_ERROR("failed to add fb helper to connectors\n"); |