From: Dan Carpenter <dan.carpenter@oracle.com>
To: "Christian König" <ckoenig.leichtzumerken@gmail.com>
Cc: Thomas Hellstr <C3@mwanda>,
B6@mwanda, m <thomas.hellstrom@linux.intel.com>,
Huang Rui <ray.huang@amd.com>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm/ttm: fix error handling in ttm_bo_handle_move_mem()
Date: Wed, 16 Jun 2021 11:37:58 +0300 [thread overview]
Message-ID: <20210616083758.GC1901@kadam> (raw)
In-Reply-To: <03d0b798-d1ab-5b6f-2c27-8140d923d445@gmail.com>
On Wed, Jun 16, 2021 at 08:46:33AM +0200, Christian König wrote:
> Sending the first message didn't worked, so let's try again.
>
> Am 16.06.21 um 08:30 schrieb Dan Carpenter:
> > There are three bugs here:
> > 1) We need to call unpopulate() if ttm_tt_populate() succeeds.
> > 2) The "new_man = ttm_manager_type(bdev, bo->mem.mem_type);" assignment
> > was wrong and it was really assigning "new_mem = old_mem;". There
> > is no need for this assignment anyway as we already have the value
> > for "new_mem".
> > 3) The (!new_man->use_tt) condition is reversed.
> >
> > Fixes: ba4e7d973dd0 ("drm: Add the TTM GPU memory manager subsystem.")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > ---
> > This is from reading the code and I can't swear that I have understood
> > it correctly. My nouveau driver is currently unusable and this patch
> > has not helped. But hopefully if I fix enough bugs eventually it will
> > start to work.
>
> Well NAK, the code previously looked quite well and you are breaking it now.
>
> What's the problem with nouveau?
>
The new Firefox seems to excersize nouveau more than the old one so
when I start 10 firefox windows it just hangs the graphics.
I've added debug code and it seems like the problem is that
nv50_mem_new() is failing.
> > drivers/gpu/drm/ttm/ttm_bo.c | 14 ++++++++------
> > 1 file changed, 8 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> > index ebcffe794adb..72dde093f754 100644
> > --- a/drivers/gpu/drm/ttm/ttm_bo.c
> > +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> > @@ -180,12 +180,12 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
> > */
> > ret = ttm_tt_create(bo, old_man->use_tt);
> > if (ret)
> > - goto out_err;
> > + return ret;
> > if (mem->mem_type != TTM_PL_SYSTEM) {
> > ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
> > if (ret)
> > - goto out_err;
> > + goto err_destroy;
> > }
> > }
> > @@ -193,15 +193,17 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
> > if (ret) {
> > if (ret == -EMULTIHOP)
> > return ret;
> > - goto out_err;
> > + goto err_unpopulate;
> > }
> > ctx->bytes_moved += bo->base.size;
> > return 0;
> > -out_err:
> > - new_man = ttm_manager_type(bdev, bo->mem.mem_type);
>
> This here switches new and old manager. E.g. the new_man is now pointing to
> the existing resource manager.
Why not just use "old_man" instead of basically the equivalent to
"new_man = old_man"? Can the old_man change part way through the
function?
regards,
dan carpenter
next prev parent reply other threads:[~2021-06-16 8:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210610154113.GJ1955@kadam>
2021-06-16 6:30 ` [PATCH] drm/ttm: fix error handling in ttm_bo_handle_move_mem() Dan Carpenter
2021-06-16 6:46 ` Christian König
2021-06-16 8:37 ` Dan Carpenter [this message]
2021-06-16 8:47 ` Christian König
2021-06-16 9:36 ` Dan Carpenter
2021-06-16 11:00 ` Christian König
2021-06-16 19:19 ` Dan Carpenter
2021-06-17 7:41 ` Christian König
2021-06-17 16:54 ` Daniel Vetter
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=20210616083758.GC1901@kadam \
--to=dan.carpenter@oracle.com \
--cc=B6@mwanda \
--cc=C3@mwanda \
--cc=airlied@linux.ie \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ray.huang@amd.com \
--cc=thomas.hellstrom@linux.intel.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).