[PATCH] Revert "drm/exynos: resolve infinite loop issue on multi-platform"

[PATCH] Revert "drm/exynos: resolve infinite loop issue on multi-platform"

[Hyungwon Hwang]

This patch reverts commit 5cbb37df378d ("drm/exynos: resolve infinite
loop issue on multi-platform"). This logic is already included.

Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
---
 drivers/gpu/drm/exynos/exynos_drm_drv.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index 25ba362..d71fb54 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -646,18 +646,6 @@ static int exynos_drm_init(void)
 	if (!is_exynos)
 		return -ENODEV;
 
-	/*
-	 * Register device object only in case of Exynos SoC.
-	 *
-	 * Below codes resolves temporarily infinite loop issue incurred
-	 * by Exynos drm driver when using multi-platform kernel.
-	 * So these codes will be replaced with more generic way later.
-	 */
-	if (!of_machine_is_compatible("samsung,exynos3") &&
-			!of_machine_is_compatible("samsung,exynos4") &&
-			!of_machine_is_compatible("samsung,exynos5"))
-		return -ENODEV;
-
 	exynos_drm_pdev = platform_device_register_simple("exynos-drm", -1,
 								NULL, 0);
 	if (IS_ERR(exynos_drm_pdev))
-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] Revert "drm/exynos: resolve infinite loop issue on multi-platform"

[Inki Dae]

On 2015년 01월 08일 10:39, Hyungwon Hwang wrote:
> This patch reverts commit 5cbb37df378d ("drm/exynos: resolve infinite
> loop issue on multi-platform"). This logic is already included.

Hyungwon, do not revert this patch. Just remove it instead. See the
below my comment.

> 
> Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>
> ---
>  drivers/gpu/drm/exynos/exynos_drm_drv.c | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> index 25ba362..d71fb54 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> @@ -646,18 +646,6 @@ static int exynos_drm_init(void)
>  	if (!is_exynos)
>  		return -ENODEV;
>  
> -	/*
> -	 * Register device object only in case of Exynos SoC.
> -	 *
> -	 * Below codes resolves temporarily infinite loop issue incurred
> -	 * by Exynos drm driver when using multi-platform kernel.
> -	 * So these codes will be replaced with more generic way later.
> -	 */
> -	if (!of_machine_is_compatible("samsung,exynos3") &&
> -			!of_machine_is_compatible("samsung,exynos4") &&
> -			!of_machine_is_compatible("samsung,exynos5"))
> -		return -ENODEV;


Above codes had been replaced with more cleanup codes but it seems that
they was added by below merge conflict work again,

commit e8115e79aa62b6ebdb3e8e61ca4092cc32938afc
Merge: 9be23ae 009d043
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Dec 2 10:58:33 2014 +1000

    Merge tag 'v3.18-rc7' into drm-next

    This fixes a bunch of conflicts prior to merging i915 tree.

    Linux 3.18-rc7

    Conflicts:
        drivers/gpu/drm/exynos/exynos_drm_drv.c
        drivers/gpu/drm/i915/i915_drv.c
        drivers/gpu/drm/i915/intel_pm.c
        drivers/gpu/drm/tegra/dc.c

> -
>  	exynos_drm_pdev = platform_device_register_simple("exynos-drm", -1,
>  								NULL, 0);
>  	if (IS_ERR(exynos_drm_pdev))
> 

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel