From: "Christian König" <christian.koenig@amd.com>
To: Shiwu Zhang <shiwu.zhang@amd.com>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/ttm: fix error handling if no BO can be swapped out
Date: Wed, 21 Apr 2021 15:34:01 +0200 [thread overview]
Message-ID: <91c93764-119a-3ffa-a38d-2b2202fdaa51@amd.com> (raw)
In-Reply-To: <20210420143257.13865-1-shiwu.zhang@amd.com>
Am 20.04.21 um 16:32 schrieb Shiwu Zhang:
> In case that all pre-allocated BOs are busy, just continue to populate
> BOs since likely half of system memory in total is still free.
>
> Signed-off-by: Shiwu Zhang <shiwu.zhang@amd.com>
> ---
> drivers/gpu/drm/ttm/ttm_device.c | 4 ++--
> drivers/gpu/drm/ttm/ttm_tt.c | 2 ++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c
> index 1f2024164d72..0200709db9be 100644
> --- a/drivers/gpu/drm/ttm/ttm_device.c
> +++ b/drivers/gpu/drm/ttm/ttm_device.c
> @@ -133,7 +133,7 @@ int ttm_device_swapout(struct ttm_device *bdev, struct ttm_operation_ctx *ctx,
> struct ttm_resource_manager *man;
> struct ttm_buffer_object *bo;
> unsigned i, j;
> - int ret;
> + int ret=-EBUSY;
>
> spin_lock(&bdev->lru_lock);
> for (i = TTM_PL_SYSTEM; i < TTM_NUM_MEM_TYPES; ++i) {
> @@ -161,7 +161,7 @@ int ttm_device_swapout(struct ttm_device *bdev, struct ttm_operation_ctx *ctx,
> }
> }
> spin_unlock(&bdev->lru_lock);
> - return 0;
> + return ret;
The function should return the number of pages swapped out. Returning 0
here is already perfectly ok.
> }
> EXPORT_SYMBOL(ttm_device_swapout);
>
> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
> index 48c407cff112..4e1e06a04428 100644
> --- a/drivers/gpu/drm/ttm/ttm_tt.c
> +++ b/drivers/gpu/drm/ttm/ttm_tt.c
> @@ -329,6 +329,8 @@ int ttm_tt_populate(struct ttm_device *bdev,
> ttm_dma32_pages_limit) {
>
> ret = ttm_global_swapout(ctx, GFP_KERNEL);
> + if (ret == -EBUSY)
> + break;
> if (ret < 0)
> goto error;
Here we should just have a check for ret == 0 instead of testing for -EBUSY.
Regards,
Christian.
> }
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-04-21 13:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 14:32 [PATCH] drm/ttm: fix error handling if no BO can be swapped out Shiwu Zhang
2021-04-21 13:34 ` Christian König [this message]
2021-04-22 8:39 ` Zhang, Morris
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=91c93764-119a-3ffa-a38d-2b2202fdaa51@amd.com \
--to=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=shiwu.zhang@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).