From: Dor Askayo <dor.askayo@gmail.com>
To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
Alex Deucher <alexander.deucher@amd.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>
Cc: "Harry Wentland" <harry.wentland@amd.com>,
"Leo Li" <sunpeng.li@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"David (ChunMing) Zhou" <David1.Zhou@amd.com>
Subject: Re: [PATCH] drm/amd/display: do not allocate display_mode_lib unnecessarily
Date: Fri, 24 Jan 2020 12:18:43 +0200 [thread overview]
Message-ID: <CAO80jNS6fV+8s1R5CH9swbkDB+-RmZADFvA0UkBmWG2bEQioPw@mail.gmail.com> (raw)
In-Reply-To: <CAO80jNS795mgHCp3XedZQ1o1QHbwxb8DeuSqPtKHmKbAVYsfmg@mail.gmail.com>
On Fri, Jan 17, 2020 at 12:59 PM Dor Askayo <dor.askayo@gmail.com> wrote:
>
> On Sat, Jan 4, 2020 at 2:23 PM Dor Askayo <dor.askayo@gmail.com> wrote:
> >
> > This allocation isn't required and can fail when resuming from suspend.
> >
> > Bug: https://gitlab.freedesktop.org/drm/amd/issues/1009
> > Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
> > ---
> > drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +++++++++--------
> > 1 file changed, 9 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
> > index dd4731ab935c..83ebb716166b 100644
> > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
> > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
> > @@ -2179,12 +2179,7 @@ void dc_set_power_state(
> > enum dc_acpi_cm_power_state power_state)
> > {
> > struct kref refcount;
> > - struct display_mode_lib *dml = kzalloc(sizeof(struct display_mode_lib),
> > - GFP_KERNEL);
> > -
> > - ASSERT(dml);
> > - if (!dml)
> > - return;
> > + struct display_mode_lib *dml;
> >
> > switch (power_state) {
> > case DC_ACPI_CM_POWER_STATE_D0:
> > @@ -2206,6 +2201,12 @@ void dc_set_power_state(
> > * clean state, and dc hw programming optimizations will not
> > * cause any trouble.
> > */
> > + dml = kzalloc(sizeof(struct display_mode_lib),
> > + GFP_KERNEL);
> > +
> > + ASSERT(dml);
> > + if (!dml)
> > + return;
> >
> > /* Preserve refcount */
> > refcount = dc->current_state->refcount;
> > @@ -2219,10 +2220,10 @@ void dc_set_power_state(
> > dc->current_state->refcount = refcount;
> > dc->current_state->bw_ctx.dml = *dml;
> >
> > + kfree(dml);
> > +
> > break;
> > }
> > -
> > - kfree(dml);
> > }
> >
> > void dc_resume(struct dc *dc)
> > --
> > 2.24.1
> >
>
> I've been running with this fix applied on top of Fedora's
> 5.3.16-300.fc31.x86_64 kernel for the past two weeks, suspending
> and resuming often. This the first time since I bought my RX 580 8GB
> more than a year ago that I can suspend and resume reliably.
>
> I'd appreciate a quick review for the above, it really is a trivial change.
>
> Thanks,
> Dor
Bumping this up again. I've been running with this change for the past
20 days without issues.
Thanks,
Dor
On Fri, Jan 17, 2020 at 12:59 PM Dor Askayo <dor.askayo@gmail.com> wrote:
>
> On Sat, Jan 4, 2020 at 2:23 PM Dor Askayo <dor.askayo@gmail.com> wrote:
> >
> > This allocation isn't required and can fail when resuming from suspend.
> >
> > Bug: https://gitlab.freedesktop.org/drm/amd/issues/1009
> > Signed-off-by: Dor Askayo <dor.askayo@gmail.com>
> > ---
> > drivers/gpu/drm/amd/display/dc/core/dc.c | 17 +++++++++--------
> > 1 file changed, 9 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
> > index dd4731ab935c..83ebb716166b 100644
> > --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
> > +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
> > @@ -2179,12 +2179,7 @@ void dc_set_power_state(
> > enum dc_acpi_cm_power_state power_state)
> > {
> > struct kref refcount;
> > - struct display_mode_lib *dml = kzalloc(sizeof(struct display_mode_lib),
> > - GFP_KERNEL);
> > -
> > - ASSERT(dml);
> > - if (!dml)
> > - return;
> > + struct display_mode_lib *dml;
> >
> > switch (power_state) {
> > case DC_ACPI_CM_POWER_STATE_D0:
> > @@ -2206,6 +2201,12 @@ void dc_set_power_state(
> > * clean state, and dc hw programming optimizations will not
> > * cause any trouble.
> > */
> > + dml = kzalloc(sizeof(struct display_mode_lib),
> > + GFP_KERNEL);
> > +
> > + ASSERT(dml);
> > + if (!dml)
> > + return;
> >
> > /* Preserve refcount */
> > refcount = dc->current_state->refcount;
> > @@ -2219,10 +2220,10 @@ void dc_set_power_state(
> > dc->current_state->refcount = refcount;
> > dc->current_state->bw_ctx.dml = *dml;
> >
> > + kfree(dml);
> > +
> > break;
> > }
> > -
> > - kfree(dml);
> > }
> >
> > void dc_resume(struct dc *dc)
> > --
> > 2.24.1
> >
>
> I've been running with this fix applied on top of Fedora's
> 5.3.16-300.fc31.x86_64 kernel for
> the past two weeks, suspending and resuming often. This the first time
> since I bought my
> RX 580 8GB more than a year ago that I can suspend and resume reliably.
>
> I'd appreciate a quick review for the above, it really is a trivial change.
>
> Thanks,
> Dor
next prev parent reply other threads:[~2020-01-24 10:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-04 12:22 [PATCH] drm/amd/display: do not allocate display_mode_lib unnecessarily Dor Askayo
2020-01-17 10:59 ` Dor Askayo
2020-01-24 10:18 ` Dor Askayo [this message]
2020-01-24 16:41 ` Leo
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=CAO80jNS6fV+8s1R5CH9swbkDB+-RmZADFvA0UkBmWG2bEQioPw@mail.gmail.com \
--to=dor.askayo@gmail.com \
--cc=David1.Zhou@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sunpeng.li@amd.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;
as well as URLs for NNTP newsgroup(s).