[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <fb5fb363e91fd70236674de8b6f3cf88@codeaurora.org>
Date: Tue, 10 Aug 2021 12:30:12 -0700
From: khsieh@...eaurora.org
To: Stephen Boyd <swboyd@...omium.org>
Cc: agross@...nel.org, bjorn.andersson@...aro.org, robdclark@...il.com,
sean@...rly.run, vkoul@...nel.org, abhinavk@...eaurora.org,
aravindh@...eaurora.org, freedreno@...ts.freedesktop.org,
dri-devel@...ts.freedesktop.org, linux-arm-msm@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] drm/msm/dp: add drm debug logs to dp_pm_resume/suspend
On 2021-08-10 12:23, Stephen Boyd wrote:
> Quoting khsieh@...eaurora.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@...eaurora.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.
Powered by blists - more mailing lists