From: khsieh@codeaurora.org
To: Stephen Boyd <swboyd@chromium.org>
Cc: agross@kernel.org, bjorn.andersson@linaro.org,
robdclark@gmail.com, sean@poorly.run, vkoul@kernel.org,
abhinavk@codeaurora.org, aravindh@codeaurora.org,
freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] drm/msm/dp: add drm debug logs to dp_pm_resume/suspend
Date: Tue, 10 Aug 2021 12:30:12 -0700 [thread overview]
Message-ID: <fb5fb363e91fd70236674de8b6f3cf88@codeaurora.org> (raw)
In-Reply-To: <CAE-0n51NsjfT62anGiQ7FaBgs=bThVq89j3UMp4rNj9raGkwOw@mail.gmail.com>
On 2021-08-10 12:23, Stephen Boyd wrote:
> Quoting khsieh@codeaurora.org (2021-08-10 12:18:02)
>> On 2021-08-10 11:33, Stephen Boyd wrote:
>> > Quoting Kuogee Hsieh (2021-08-10 08:29:22)
>> >> Changes in V2:
>> >> -- correct Fixes text
>> >> -- drop commit text
>> >>
>> >> Fixes: 601f0479c583 ("drm/msm/dp: add logs across DP driver for ease
>> >> of debugging")
>> >> Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
>> >> ---
>> >> drivers/gpu/drm/msm/dp/dp_display.c | 13 +++++++++++++
>> >> 1 file changed, 13 insertions(+)
>> >
>> > BTW, this conflicts with commit
>> > e8a767e04dbc7b201cb17ab99dca723a3488b6d4
>> > in msm-next. The resolution is trivial but just wanted to mention it.
>>
>> I Just fetched msm-next and cherry-pick this patch over, no conflict
>> seen.
>> Is this conflict need to be fixed?
>>
>
> Oh sorry, I mean commit afc9b8b6bab8 ("drm/msm/dp: signal audio plugged
> change at dp_pm_resume") which doesn't seem to be in msm-next. Maybe
> Rob
> will resolve the conflict directly.
Yes, I just found that commit afc9b8b6bab8 ("drm/msm/dp: signal audio
plugged
> change at dp_pm_resume") is not merged in msm-next.
prev parent reply other threads:[~2021-08-10 19:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-10 15:29 [PATCH v2] drm/msm/dp: add drm debug logs to dp_pm_resume/suspend Kuogee Hsieh
2021-08-10 18:31 ` Stephen Boyd
2021-08-10 18:33 ` Stephen Boyd
2021-08-10 19:18 ` khsieh
2021-08-10 19:23 ` Stephen Boyd
2021-08-10 19:30 ` khsieh [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=fb5fb363e91fd70236674de8b6f3cf88@codeaurora.org \
--to=khsieh@codeaurora.org \
--cc=abhinavk@codeaurora.org \
--cc=agross@kernel.org \
--cc=aravindh@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=swboyd@chromium.org \
--cc=vkoul@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.