From: Inki Dae <inki.dae@samsung.com>
To: Hyungwon Hwang <human.hwang@samsung.com>
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] Revert "drm/exynos: resolve infinite loop issue on multi-platform"
Date: Fri, 09 Jan 2015 10:06:57 +0900 [thread overview]
Message-ID: <54AF29B1.6020801@samsung.com> (raw)
In-Reply-To: <1420681152-20213-1-git-send-email-human.hwang@samsung.com>
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
prev parent reply other threads:[~2015-01-09 1:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-08 1:39 [PATCH] Revert "drm/exynos: resolve infinite loop issue on multi-platform" Hyungwon Hwang
2015-01-09 1:06 ` Inki Dae [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54AF29B1.6020801@samsung.com \
--to=inki.dae@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=human.hwang@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox