From: Qiang Yu <yuq825@gmail.com>
To: Vasily Khoruzhick <anarsoul@gmail.com>
Cc: David Airlie <airlied@linux.ie>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
lima@lists.freedesktop.org
Subject: Re: [PATCH] drm/lima: fix recovering from PLBU out of memory
Date: Mon, 17 Feb 2020 11:06:02 +0800 [thread overview]
Message-ID: <CAKGbVbvPPowjVixjyfBF=z=6y5GDEsV3d-2pzdRWK7pt3ewRew@mail.gmail.com> (raw)
In-Reply-To: <CAKGbVbvEDYJ19KVWXN0k-5niXLjmPYvxGJQ2-3GWTyYyFkH0Gw@mail.gmail.com>
applied to drm-misc-next.
On Mon, Feb 17, 2020 at 9:20 AM Qiang Yu <yuq825@gmail.com> wrote:
>
> Looks good for me, patch is:
> Reviewed-by: Qiang Yu <yuq825@gmail.com>
>
> Regards,
> Qiang
>
> On Sat, Feb 15, 2020 at 11:50 AM Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> >
> > It looks like on PLBU_OUT_OF_MEM interrupt we need to resume from where we
> > stopped, i.e. new PLBU heap start is old end. Also update end address
> > in GP frame to grow heap on 2nd and subsequent out of memory interrupts.
> >
> > Fixes: 2081e8dcf1ee ("drm/lima: recover task by enlarging heap buffer")
> > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> > ---
> > drivers/gpu/drm/lima/lima_gp.c | 7 ++++++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/lima/lima_gp.c b/drivers/gpu/drm/lima/lima_gp.c
> > index d1e7826c2d74..325604262def 100644
> > --- a/drivers/gpu/drm/lima/lima_gp.c
> > +++ b/drivers/gpu/drm/lima/lima_gp.c
> > @@ -224,8 +224,13 @@ static int lima_gp_task_recover(struct lima_sched_pipe *pipe)
> > }
> >
> > gp_write(LIMA_GP_INT_MASK, LIMA_GP_IRQ_MASK_USED);
> > + /* Resume from where we stopped, i.e. new start is old end */
> > + gp_write(LIMA_GP_PLBU_ALLOC_START_ADDR,
> > + f[LIMA_GP_PLBU_ALLOC_END_ADDR >> 2]);
> > + f[LIMA_GP_PLBU_ALLOC_END_ADDR >> 2] =
> > + f[LIMA_GP_PLBU_ALLOC_START_ADDR >> 2] + task->heap->heap_size;
> > gp_write(LIMA_GP_PLBU_ALLOC_END_ADDR,
> > - f[LIMA_GP_PLBU_ALLOC_START_ADDR >> 2] + task->heap->heap_size);
> > + f[LIMA_GP_PLBU_ALLOC_END_ADDR >> 2]);
> > gp_write(LIMA_GP_CMD, LIMA_GP_CMD_UPDATE_PLBU_ALLOC);
> > return 0;
> > }
> > --
> > 2.25.0
> >
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2020-02-17 3:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-15 3:50 [PATCH] drm/lima: fix recovering from PLBU out of memory Vasily Khoruzhick
2020-02-17 1:20 ` Qiang Yu
2020-02-17 3:06 ` Qiang Yu [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='CAKGbVbvPPowjVixjyfBF=z=6y5GDEsV3d-2pzdRWK7pt3ewRew@mail.gmail.com' \
--to=yuq825@gmail.com \
--cc=airlied@linux.ie \
--cc=anarsoul@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=lima@lists.freedesktop.org \
--cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).