* linux-next: build failure after merge of the drm-misc tree
@ 2019-08-07 3:21 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2019-08-07 3:21 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Alex Deucher
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Felix Kuehling, Gerd Hoffmann
[-- Attachment #1: Type: text/plain, Size: 2305 bytes --]
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_object.c: In function 'amdgpu_bo_release_notify':
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1245:28: error: 'struct ttm_buffer_object' has no member named 'resv'
reservation_object_lock(bo->resv, NULL);
^~
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1247:47: error: 'struct ttm_buffer_object' has no member named 'resv'
r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence);
^~
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1253:30: error: 'struct ttm_buffer_object' has no member named 'resv'
reservation_object_unlock(bo->resv);
^~
Caused by commit
5a5011a72489 ("drm/amdgpu: switch driver from bo->resv to bo->base.resv")
interacting with commit
ab2f7a5c18b5 ("drm/amdgpu: Implement VRAM wipe on release")
from the amdgpu tree.
I have added the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Aug 2019 13:17:54 +1000
Subject: [PATCH] drm/amdgpu: fix up for "drm/amdgpu: switch driver from bo->resv to bo->base.resv"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index b2c03be51c29..2d07f16f1789 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1242,15 +1242,15 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)
!(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE))
return;
- reservation_object_lock(bo->resv, NULL);
+ reservation_object_lock(bo->base.resv, NULL);
- r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence);
+ r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->base.resv, &fence);
if (!WARN_ON(r)) {
amdgpu_bo_fence(abo, fence, false);
dma_fence_put(fence);
}
- reservation_object_unlock(bo->resv);
+ reservation_object_unlock(bo->base.resv);
}
/**
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 7+ messages in thread
* linux-next: build failure after merge of the drm-misc tree
@ 2019-08-07 3:21 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2019-08-07 3:21 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Alex Deucher
Cc: Felix Kuehling, Linux Next Mailing List,
Linux Kernel Mailing List, Gerd Hoffmann
[-- Attachment #1.1: Type: text/plain, Size: 2305 bytes --]
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_object.c: In function 'amdgpu_bo_release_notify':
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1245:28: error: 'struct ttm_buffer_object' has no member named 'resv'
reservation_object_lock(bo->resv, NULL);
^~
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1247:47: error: 'struct ttm_buffer_object' has no member named 'resv'
r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence);
^~
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1253:30: error: 'struct ttm_buffer_object' has no member named 'resv'
reservation_object_unlock(bo->resv);
^~
Caused by commit
5a5011a72489 ("drm/amdgpu: switch driver from bo->resv to bo->base.resv")
interacting with commit
ab2f7a5c18b5 ("drm/amdgpu: Implement VRAM wipe on release")
from the amdgpu tree.
I have added the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 7 Aug 2019 13:17:54 +1000
Subject: [PATCH] drm/amdgpu: fix up for "drm/amdgpu: switch driver from bo->resv to bo->base.resv"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index b2c03be51c29..2d07f16f1789 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1242,15 +1242,15 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)
!(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE))
return;
- reservation_object_lock(bo->resv, NULL);
+ reservation_object_lock(bo->base.resv, NULL);
- r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence);
+ r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->base.resv, &fence);
if (!WARN_ON(r)) {
amdgpu_bo_fence(abo, fence, false);
dma_fence_put(fence);
}
- reservation_object_unlock(bo->resv);
+ reservation_object_unlock(bo->base.resv);
}
/**
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-misc tree
2019-08-07 3:21 ` Stephen Rothwell
(?)
@ 2019-08-07 3:48 ` Patchwork
-1 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-08-07 3:48 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/64809/
State : failure
== Summary ==
Applying: linux-next: build failure after merge of the drm-misc tree
error: sha1 information is lacking or useless (drivers/gpu/drm/amd/amdgpu/amdgpu_object.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 linux-next: build failure after merge of the drm-misc tree
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-misc tree
2019-08-28 8:55 Stephen Rothwell
@ 2019-08-28 15:27 ` Patchwork
0 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-08-28 15:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/65916/
State : failure
== Summary ==
Applying: linux-next: build failure after merge of the drm-misc tree
Using index info to reconstruct a base tree...
M drivers/gpu/drm/virtio/virtgpu_object.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-misc tree
2019-06-14 6:42 ` Stephen Rothwell
@ 2019-06-18 8:11 ` Jani Nikula
0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2019-06-18 8:11 UTC (permalink / raw)
To: Stephen Rothwell, Patchwork, Arkadiusz Hiler; +Cc: intel-gfx
On Fri, 14 Jun 2019, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Fri, 14 Jun 2019 04:47:35 -0000 Patchwork <patchwork@emeril.freedesktop.org> wrote:
>>
>> == Series Details ==
>>
>> Series: linux-next: build failure after merge of the drm-misc tree
>> URL : https://patchwork.freedesktop.org/series/62080/
>> State : failure
>>
>> == Summary ==
>>
>> CALL scripts/checksyscalls.sh
>> CALL scripts/atomic/check-atomics.sh
>> DESCEND objtool
>> CHK include/generated/compile.h
>> CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4024:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>> .atomic_check = amdgpu_dm_connector_atomic_check,
>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4024:18: note: (near initialization for ‘amdgpu_dm_connector_helper_funcs.atomic_check’)
>> cc1: some warnings being treated as errors
>> scripts/Makefile.build:278: recipe for target 'drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o' failed
>> make[4]: *** [drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o] Error 1
>> scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm/amd/amdgpu' failed
>> make[3]: *** [drivers/gpu/drm/amd/amdgpu] Error 2
>> scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm' failed
>> make[2]: *** [drivers/gpu/drm] Error 2
>> scripts/Makefile.build:489: recipe for target 'drivers/gpu' failed
>> make[1]: *** [drivers/gpu] Error 2
>> Makefile:1071: recipe for target 'drivers' failed
>> make: *** [drivers] Error 2
>>
>
> Can someone please stop this CI from trying to validate linux-next
> merge fix patches ...
Half the complaints are about CI trying to validate too much, and the
other half are about not validating enough...
Arek?
BR,
Jani.
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-misc tree
2019-06-14 4:47 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2019-06-14 6:42 ` Stephen Rothwell
2019-06-18 8:11 ` Jani Nikula
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2019-06-14 6:42 UTC (permalink / raw)
To: Patchwork; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 1774 bytes --]
Hi all,
On Fri, 14 Jun 2019 04:47:35 -0000 Patchwork <patchwork@emeril.freedesktop.org> wrote:
>
> == Series Details ==
>
> Series: linux-next: build failure after merge of the drm-misc tree
> URL : https://patchwork.freedesktop.org/series/62080/
> State : failure
>
> == Summary ==
>
> CALL scripts/checksyscalls.sh
> CALL scripts/atomic/check-atomics.sh
> DESCEND objtool
> CHK include/generated/compile.h
> CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4024:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .atomic_check = amdgpu_dm_connector_atomic_check,
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4024:18: note: (near initialization for ‘amdgpu_dm_connector_helper_funcs.atomic_check’)
> cc1: some warnings being treated as errors
> scripts/Makefile.build:278: recipe for target 'drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o' failed
> make[4]: *** [drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o] Error 1
> scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm/amd/amdgpu' failed
> make[3]: *** [drivers/gpu/drm/amd/amdgpu] Error 2
> scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm' failed
> make[2]: *** [drivers/gpu/drm] Error 2
> scripts/Makefile.build:489: recipe for target 'drivers/gpu' failed
> make[1]: *** [drivers/gpu] Error 2
> Makefile:1071: recipe for target 'drivers' failed
> make: *** [drivers] Error 2
>
Can someone please stop this CI from trying to validate linux-next
merge fix patches ...
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✗ Fi.CI.BAT: failure for linux-next: build failure after merge of the drm-misc tree
2019-06-14 4:41 Stephen Rothwell
@ 2019-06-14 4:47 ` Patchwork
2019-06-14 6:42 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Patchwork @ 2019-06-14 4:47 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-gfx
== Series Details ==
Series: linux-next: build failure after merge of the drm-misc tree
URL : https://patchwork.freedesktop.org/series/62080/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4024:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.atomic_check = amdgpu_dm_connector_atomic_check,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4024:18: note: (near initialization for ‘amdgpu_dm_connector_helper_funcs.atomic_check’)
cc1: some warnings being treated as errors
scripts/Makefile.build:278: recipe for target 'drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o' failed
make[4]: *** [drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.o] Error 1
scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm/amd/amdgpu' failed
make[3]: *** [drivers/gpu/drm/amd/amdgpu] Error 2
scripts/Makefile.build:489: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:489: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1071: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-08-28 15:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-07 3:21 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2019-08-07 3:21 ` Stephen Rothwell
2019-08-07 3:48 ` ✗ Fi.CI.BAT: failure for " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2019-08-28 8:55 Stephen Rothwell
2019-08-28 15:27 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-06-14 4:41 Stephen Rothwell
2019-06-14 4:47 ` ✗ Fi.CI.BAT: failure for " Patchwork
2019-06-14 6:42 ` Stephen Rothwell
2019-06-18 8:11 ` Jani Nikula
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.