<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> [Public] <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> I've dropped it from my tree in that case. </div> <div id="appendonsend"></div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: Christian König <ckoenig.leichtzumerken@gmail.com> Sent: Monday, June 21, 2021 6:27 AM To: Alex Deucher <alexdeucher@gmail.com>; Kuehling, Felix <Felix.Kuehling@amd.com> Cc: David Airlie <airlied@linux.ie>; Pan, Xinhui <Xinhui.Pan@amd.com>; kernel-janitors@vger.kernel.org <kernel-janitors@vger.kernel.org>; Maling list - DRI developers <dri-devel@lists.freedesktop.org>; amd-gfx list <amd-gfx@lists.freedesktop.org>; Daniel Vetter <daniel@ffwll.ch>; Deucher, Alexander <Alexander.Deucher@amd.com>; Dave Airlie <airlied@redhat.com>; Koenig, Christian <Christian.Koenig@amd.com>; Dan Carpenter <dan.carpenter@oracle.com> Subject: Re: [PATCH] drm/amdgpu: fix amdgpu_preempt_mgr_new() <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">Am 18.06.21 um 23:18 schrieb Alex Deucher: > On Fri, Jun 18, 2021 at 11:40 AM Felix Kuehling <felix.kuehling@amd.com> wrote: >> Am 2021-06-18 um 4:39 a.m. schrieb Christian König: >>> Am 18.06.21 um 10:37 schrieb Dan Carpenter: >>>> There is a reversed if statement in amdgpu_preempt_mgr_new() so it >>>> always returns -ENOMEM. >>>> >>>> Fixes: 09b020bb05a5 ("Merge tag 'drm-misc-next-2021-06-09' of >>>> git://anongit.freedesktop.org/drm/drm-misc into drm-next") >>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> >>> Most be some fallout from merging it with the TTM changes. >>> >>> Anyway, patch is Reviewed-by: Christian König <christian.koenig@amd.com> >> This is obviously not for amd-staging-drm-next. Christian, are you going >> to apply it to the relevant branches? > I've applied it to my drm-next branch. I already pushed it to drm-misc-next last week. Christian. > > Alex > > >> Thanks, >> Felix >> >> >>> Thanks, >>> Christian. >>> >>>> --- >>>> drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c >>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c >>>> index f6aff7ce5160..d02c8637f909 100644 >>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c >>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c >>>> @@ -71,7 +71,7 @@ static int amdgpu_preempt_mgr_new(struct >>>> ttm_resource_manager *man, >>>> struct amdgpu_preempt_mgr *mgr = to_preempt_mgr(man); >>>> *res = kzalloc(sizeof(**res), GFP_KERNEL); >>>> - if (*res) >>>> + if (!*res) >>>> return -ENOMEM; >>>> ttm_resource_init(tbo, place, *res); >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@lists.freedesktop.org >> <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C096813db12f24172870508d9349f375a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637598680703030828%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=%2Ffg7TXDA9%2F%2Fjin8T5f3V11fAv3PVvtDFluNHnhwyOGM%3D&reserved=0"> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C096813db12f24172870508d9349f375a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637598680703030828%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=%2Ffg7TXDA9%2F%2Fjin8T5f3V11fAv3PVvtDFluNHnhwyOGM%3D&reserved=0</a> > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C096813db12f24172870508d9349f375a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637598680703030828%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=%2Ffg7TXDA9%2F%2Fjin8T5f3V11fAv3PVvtDFluNHnhwyOGM%3D&reserved=0"> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C096813db12f24172870508d9349f375a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637598680703030828%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=%2Ffg7TXDA9%2F%2Fjin8T5f3V11fAv3PVvtDFluNHnhwyOGM%3D&reserved=0</a> </div> </div> </div> </body> </html>