From: Inki Dae <inki.dae@samsung.com>
To: Andrzej Hajda <a.hajda@samsung.com>, linux-samsung-soc@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 0/7] drm/exynos/hdmi: add Exynos5433 support
Date: Thu, 14 Jan 2016 16:10:03 +0900 [thread overview]
Message-ID: <569749CB.9010700@samsung.com> (raw)
In-Reply-To: <569747BD.7090203@samsung.com>
2016년 01월 14일 16:01에 Andrzej Hajda 이(가) 쓴 글:
> On 01/14/2016 07:25 AM, Inki Dae wrote:
>> Hi Andrzej,
>>
>> This patch series incurred merge conflicts at severial patches so I had to merge them manually.
>> It looks good to me but it seems to need more tests so I merged them to exynos-drm-next-todo.
>> After that, I will move them to exynos-drm-next. Sorry for late reivew again.
>
> I guess it is because exynos-drm-next does not contains patch
> 'dt-bindings: remove deprecated compatible string from exynos-hdmi'.
> It is already in next, it entered via samsung-dt tree.
> With this patch this patchset applies cleanly to exynos-drm-next.
Including dt-bindings patch, other patches also incurred merge conflicts.
I think your patch set are conflicted with the configurable plane support already merged.
Thanks,
Inki Dae
>
> Regards
> Andrzej
>
>>
>> Thanks,
>> Inki Dae
>>
>> 2016년 01월 14일 13:54에 Inki Dae 이(가) 쓴 글:
>>> Hi Andrzej,
>>>
>>> Really sorry for missing this.
>>> I will merge them soon.
>>>
>>> Thanks,
>>> Inki Dae
>>>
>>> 2016년 01월 13일 23:01에 Andrzej Hajda 이(가) 쓴 글:
>>>> Hi Inki,
>>>>
>>>> Ping.
>>>>
>>>> Regards
>>>> Andrzej
>>>>
>>>> On 11/02/2015 02:16 PM, Andrzej Hajda wrote:
>>>>> Hi Inki, Krzysztof,
>>>>>
>>>>> This patchset adds support for Exynos 5433 HDMI.
>>>>> There are also few preparation/cleanup patches.
>>>>> All patches except one touch only exynos-drm.
>>>>> Sixth patch adds binding properties for Exynos5433 HDMI,
>>>>> Krzysztof could you look at it.
>>>>>
>>>>> The patchset is based on exynos-drm-next.
>>>>>
>>>>> Regards
>>>>> Andrzej
>>>>>
>>>>>
>>>>> Andrzej Hajda (7):
>>>>> drm/exynos/hdmi: clock code re-factoring
>>>>> drm/exynos/hdmi: constify global variables
>>>>> drm/exynos/hdmi: use array specifier for HDMI-PHY configurations
>>>>> drm/exynos/hdmi: code cleanup
>>>>> drm/exynos/hdmi: stop programming registers with default values
>>>>> dt-bindings: exynos_hdmi: add bindings for Exynos5433 variant
>>>>> drm/exynos/hdmi: add Exynos5433 support
>>>>>
>>>>> .../devicetree/bindings/video/exynos_hdmi.txt | 27 +-
>>>>> drivers/gpu/drm/exynos/exynos_hdmi.c | 454 +++++++++++++++------
>>>>> drivers/gpu/drm/exynos/regs-hdmi.h | 9 +-
>>>>> 3 files changed, 352 insertions(+), 138 deletions(-)
>>>>>
>>>>
>>>> --
>>>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
>>>> the body of a message to majordomo@vger.kernel.org
>>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>>
>>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>
>>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
prev parent reply other threads:[~2016-01-14 7:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-02 13:16 [PATCH 0/7] drm/exynos/hdmi: add Exynos5433 support Andrzej Hajda
2015-11-02 13:16 ` [PATCH 1/7] drm/exynos/hdmi: clock code re-factoring Andrzej Hajda
2016-01-14 5:20 ` Inki Dae
2015-11-02 13:16 ` [PATCH 2/7] drm/exynos/hdmi: constify global variables Andrzej Hajda
2015-11-02 13:16 ` [PATCH 3/7] drm/exynos/hdmi: use array specifier for HDMI-PHY configurations Andrzej Hajda
2015-11-02 13:16 ` [PATCH 4/7] drm/exynos/hdmi: code cleanup Andrzej Hajda
2015-11-02 13:16 ` [PATCH 5/7] drm/exynos/hdmi: stop programming registers with default values Andrzej Hajda
2015-11-02 13:16 ` [PATCH 6/7] dt-bindings: exynos_hdmi: add bindings for Exynos5433 variant Andrzej Hajda
2015-11-03 7:00 ` Krzysztof Kozlowski
2015-11-02 13:16 ` [PATCH 7/7] drm/exynos/hdmi: add Exynos5433 support Andrzej Hajda
2016-01-13 14:01 ` [PATCH 0/7] " Andrzej Hajda
2016-01-14 4:54 ` Inki Dae
2016-01-14 6:25 ` Inki Dae
2016-01-14 7:01 ` Andrzej Hajda
2016-01-14 7:10 ` 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=569749CB.9010700@samsung.com \
--to=inki.dae@samsung.com \
--cc=a.hajda@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-samsung-soc@vger.kernel.org \
/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