diff options
| author | Inki Dae <inki.dae@samsung.com> | 2014-11-06 05:23:35 -0500 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2014-11-10 00:40:05 -0500 |
| commit | 06a2f5c2c4e0cb4ff38ca3769ae1f81cc2d030cf (patch) | |
| tree | f7a8403d44e0ba7f2bbb981549834fb655e8c5cf /drivers/gpu | |
| parent | 66338feee458cb2b04e8f2b515b8d660e49ba29a (diff) | |
drm/exynos: resolve infinite loop issue on multi-platform
This patch resolves temporarily infinite loop issue incurred
when Exynos drm driver is enabled and multi-platform kernel
is used by registering Exynos drm device object only in case
of Exynos SoC. So this patch will be replaced with more generic
way later.
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index c57466edf45b..d41aae0dcc60 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c | |||
| @@ -741,6 +741,18 @@ static int exynos_drm_init(void) | |||
| 741 | { | 741 | { |
| 742 | int ret; | 742 | int ret; |
| 743 | 743 | ||
| 744 | /* | ||
| 745 | * Register device object only in case of Exynos SoC. | ||
| 746 | * | ||
| 747 | * Below codes resolves temporarily infinite loop issue incurred | ||
| 748 | * by Exynos drm driver when using multi-platform kernel. | ||
| 749 | * So these codes will be replaced with more generic way later. | ||
| 750 | */ | ||
| 751 | if (!of_machine_is_compatible("samsung,exynos3") && | ||
| 752 | !of_machine_is_compatible("samsung,exynos4") && | ||
| 753 | !of_machine_is_compatible("samsung,exynos5")) | ||
| 754 | return -ENODEV; | ||
| 755 | |||
| 744 | exynos_drm_pdev = platform_device_register_simple("exynos-drm", -1, | 756 | exynos_drm_pdev = platform_device_register_simple("exynos-drm", -1, |
| 745 | NULL, 0); | 757 | NULL, 0); |
| 746 | if (IS_ERR(exynos_drm_pdev)) | 758 | if (IS_ERR(exynos_drm_pdev)) |
