linux-next: build failure after merge of the drm-misc tree

List overview All Threads
Download

newer

older

PROBLEM: Switching to multiple...

[radeon-alex:drm-next 419/491]...

Stephen Rothwell

17 Jun 2020 17 Jun '20

12:59 a.m.

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu': drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit declaration of function 'drm_gem_object_put_unlocked'; did you mean 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration] 1357 | drm_gem_object_put_unlocked(&mem->bo->tbo.base); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ | drm_gem_object_put_locked

Caused by commit

ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")

interacting with commit

fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")

from Linus' tree.

I have applied the following merge fix up patch for today.

From: Stephen Rothwell sfr@canb.auug.org.au Date: Wed, 17 Jun 2020 10:55:32 +1000 Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked

Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index b91b5171270f..9015c7b76d60 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( }

/* Free the BO*/ - drm_gem_object_put_unlocked(&mem->bo->tbo.base); + drm_gem_object_put(&mem->bo->tbo.base); mutex_destroy(&mem->lock); kfree(mem);

-- 2.26.2 -- Cheers, Stephen Rothwell

Attachments:

attachment.sig (application/pgp-signature — 488 bytes)

Show replies by date

Thomas Zimmermann

17 Jun 17 Jun

6:33 a.m.

Am 17.06.20 um 02:59 schrieb Stephen Rothwell:

...

Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu': drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit declaration of function 'drm_gem_object_put_unlocked'; did you mean 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration] 1357 | drm_gem_object_put_unlocked(&mem->bo->tbo.base); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ | drm_gem_object_put_locked

Caused by commit

ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")

interacting with commit

fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")

from Linus' tree.

I have applied the following merge fix up patch for today.

From: Stephen Rothwell sfr@canb.auug.org.au Date: Wed, 17 Jun 2020 10:55:32 +1000 Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked

Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index b91b5171270f..9015c7b76d60 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( }

/* Free the BO*/

drm_gem_object_put_unlocked(&mem->bo->tbo.base);

drm_gem_object_put(&mem->bo->tbo.base);

We recently dropped the _unlock() suffix from drm_gem_object_put(). This patch should be ok.

Best regards Thomas

...

mutex_destroy(&mem->lock); kfree(mem);

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer

Stephen Rothwell

7:03 a.m.

Hi Thomas,

On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann tzimmermann@suse.de wrote:

...

We recently dropped the _unlock() suffix from drm_gem_object_put(). This patch should be ok.

Yes, but what it shows is that the drm-misc tree is still based on v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get conflicts against :-)

-- Cheers, Stephen Rothwell

Emil Velikov

7:06 p.m.

Hi Stephen,

On Wed, 17 Jun 2020 at 08:03, Stephen Rothwell sfr@canb.auug.org.au wrote:

...

Hi Thomas,

On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann tzimmermann@suse.de wrote:

...
We recently dropped the _unlock() suffix from drm_gem_object_put(). This patch should be ok.

Yes, but what it shows is that the drm-misc tree is still based on v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get conflicts against :-)

Being the culprit here - thanks for the patience and report.

I believe that both AMD and drm-misc teams are aware of this lovely situation I've put them in. As you mentioned drm-misc is a bit special and doing the usual backmerge will be fun.

If you have any tips on how to minimise such issues, I'd gladly utilise them.

Thanks again, -Emil

Stephen Rothwell

24 Jun 24 Jun

1:36 a.m.

Hi all,

On Wed, 17 Jun 2020 10:59:29 +1000 Stephen Rothwell sfr@canb.auug.org.au wrote:

...

After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu': drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit declaration of function 'drm_gem_object_put_unlocked'; did you mean 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration] 1357 | drm_gem_object_put_unlocked(&mem->bo->tbo.base); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ | drm_gem_object_put_locked

Caused by commit

ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")

interacting with commit

fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")

from Linus' tree.

I have applied the following merge fix up patch for today.

From: Stephen Rothwell sfr@canb.auug.org.au Date: Wed, 17 Jun 2020 10:55:32 +1000 Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked

Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index b91b5171270f..9015c7b76d60 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( }

/* Free the BO*/

drm_gem_object_put_unlocked(&mem->bo->tbo.base);

drm_gem_object_put(&mem->bo->tbo.base); mutex_destroy(&mem->lock); kfree(mem);

-- 2.26.2

This fix is now needed when I merge the drm tree :-(

Given that the drm tree is based on v5.8-rc2 and the commit from Linus' tree above was merged before v5.8-rc1, the above patch should be applied to the drm tree (and should have been part of the patch that merged the drm-misc tree). I am a bit suprised that the drm tree currently passes CI.

Sorry, Dave, for not cc'ing you in the original report.

-- Cheers, Stephen Rothwell

Dave Airlie

5:47 a.m.

On Wed, 24 Jun 2020 at 11:36, Stephen Rothwell sfr@canb.auug.org.au wrote:

...

Hi all,

On Wed, 17 Jun 2020 10:59:29 +1000 Stephen Rothwell sfr@canb.auug.org.au wrote:

...
After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c: In function 'amdgpu_amdkfd_gpuvm_free_memory_of_gpu': drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c:1357:2: error: implicit declaration of function 'drm_gem_object_put_unlocked'; did you mean 'drm_gem_object_put_locked'? [-Werror=implicit-function-declaration] 1357 | drm_gem_object_put_unlocked(&mem->bo->tbo.base); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ | drm_gem_object_put_locked

Caused by commit

ab15d56e27be ("drm: remove transient drm_gem_object_put_unlocked()")

interacting with commit

fd9a9f8801de ("drm/amdgpu: Use GEM obj reference for KFD BOs")

from Linus' tree.

I have applied the following merge fix up patch for today.

From: Stephen Rothwell sfr@canb.auug.org.au Date: Wed, 17 Jun 2020 10:55:32 +1000 Subject: [PATCH] drm/amdgpu: remove stray drm_gem_object_put_unlocked

Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index b91b5171270f..9015c7b76d60 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -1354,7 +1354,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( }
  /* Free the BO*/
drm_gem_object_put_unlocked(&mem->bo->tbo.base);
drm_gem_object_put(&mem->bo->tbo.base);
mutex_destroy(&mem->lock);
kfree(mem);
-- 2.26.2
This fix is now needed when I merge the drm tree :-(

Given that the drm tree is based on v5.8-rc2 and the commit from Linus' tree above was merged before v5.8-rc1, the above patch should be applied to the drm tree (and should have been part of the patch that merged the drm-misc tree). I am a bit suprised that the drm tree currently passes CI.

My bad, my local builds passed, as I had made the change but forgot the commit --amend

Pushed out a new head with it in it now.

Dave.

Stephen Rothwell

7:16 a.m.

Hi Dave,

On Wed, 24 Jun 2020 15:47:49 +1000 Dave Airlie airlied@gmail.com wrote:

...

My bad, my local builds passed, as I had made the change but forgot the commit --amend

Pushed out a new head with it in it now.

Excellent, thanks.

-- Cheers, Stephen Rothwell

1772

Age (days ago)

1779

Last active (days ago)

dri-devel@lists.freedesktop.org

6 comments

4 participants

tags (0)

participants (4)

Dave Airlie
Emil Velikov
Stephen Rothwell
Thomas Zimmermann