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 --- 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);
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
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);
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?
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);
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.
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 https://lists.freedesktop.org/mailman/listinfo/amd-gfx
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 https://lists.freedesktop.org/mailman/listinfo/amd-gfx
amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
I've dropped it from my tree in that case. ________________________________ 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()
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 https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.free...
amd-gfx mailing list amd-gfx@lists.freedesktop.org https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.free...
dri-devel@lists.freedesktop.org
-
Alex Deucher -
Christian König -
Christian König -
Dan Carpenter -
Deucher, Alexander -
Felix Kuehling