From: "Christian König" <christian.koenig@amd.com>
To: Daniel Vetter <daniel@ffwll.ch>, Shiwu Zhang <shiwu.zhang@amd.com>
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v2] drm/ttm: fix error handling if no BO can be swapped out
Date: Thu, 22 Apr 2021 13:05:15 +0200 [thread overview]
Message-ID: <cc103b78-6af3-aaa2-5102-413eae39be80@amd.com> (raw)
In-Reply-To: <YIFHRJvFwe3flG6D@phenom.ffwll.local>
Am 22.04.21 um 11:52 schrieb Daniel Vetter:
> On Thu, Apr 22, 2021 at 04:37:49PM +0800, Shiwu Zhang wrote:
>> Signed-off-by: Shiwu Zhang <shiwu.zhang@amd.com>
> Cc: stable@vger.kernel.org or at least Fixes: tag?
The code in question is only in drm-misc-next currently and won't go
upstream before 5.14.
> Zero length commit message for something that claims to be a bugfix is
> probably too short :-)
Well that is indeed a good point :)
Christian.
> -Daniel
>
>> ---
>> drivers/gpu/drm/ttm/ttm_device.c | 2 +-
>> drivers/gpu/drm/ttm/ttm_tt.c | 2 ++
>> 2 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_device.c b/drivers/gpu/drm/ttm/ttm_device.c
>> index 1f2024164d72..5dc92b056f0a 100644
>> --- a/drivers/gpu/drm/ttm/ttm_device.c
>> +++ b/drivers/gpu/drm/ttm/ttm_device.c
>> @@ -112,7 +112,7 @@ int ttm_global_swapout(struct ttm_operation_ctx *ctx, gfp_t gfp_flags)
>> {
>> struct ttm_global *glob = &ttm_glob;
>> struct ttm_device *bdev;
>> - int ret = -EBUSY;
>> + int ret = 0;
>>
>> mutex_lock(&ttm_global_mutex);
>> list_for_each_entry(bdev, &glob->device_list, device_list) {
>> diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
>> index 48c407cff112..539e0232cb3b 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 == 0)
>> + break;
>> if (ret < 0)
>> goto error;
>> }
>> --
>> 2.17.1
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Fdri-devel&data=04%7C01%7Cchristian.koenig%40amd.com%7C61e953fa35114f9d69b508d905744ac9%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637546819302622693%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=kYfLVPAIa%2FalK8g4xyI9pV7LcIH5Y7VRApNPdUtei5c%3D&reserved=0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2021-04-22 11:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-22 8:37 [PATCH v2] drm/ttm: fix error handling if no BO can be swapped out Shiwu Zhang
2021-04-22 9:21 ` Christian König
2021-04-22 10:24 ` Zhang, Morris
2021-04-22 9:52 ` Daniel Vetter
2021-04-22 11:05 ` Christian König [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=cc103b78-6af3-aaa2-5102-413eae39be80@amd.com \
--to=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.