| Message ID | 20190614144133.5dbea6bf@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: build failure after merge of the drm-misc tree | expand |
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 ...
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.
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 413bf22e9585..b3a083c9a11c 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3976,9 +3976,10 @@ is_hdr_metadata_different(const struct drm_connector_state *old_state, static int amdgpu_dm_connector_atomic_check(struct drm_connector *conn, - struct drm_connector_state *new_con_state) + struct drm_atomic_state *state) { - struct drm_atomic_state *state = new_con_state->state; + struct drm_connector_state *new_con_state = + drm_atomic_get_new_connector_state(state, conn); struct drm_connector_state *old_con_state = drm_atomic_get_old_connector_state(state, conn); struct drm_crtc *crtc = new_con_state->crtc;
Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4031:18: error: initialization of 'int (*)(struct drm_connector *, struct drm_atomic_state *)' from incompatible pointer type 'int (*)(struct drm_connector *, struct drm_connector_state *)' [-Werror=incompatible-pointer-types] .atomic_check = amdgpu_dm_connector_atomic_check, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:4031:18: note: (near initialization for 'amdgpu_dm_connector_helper_funcs.atomic_check') Caused by commit 6f3b62781bbd ("drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state") interacting with commit 88694af9e4d1 ("drm/amd/display: Expose HDR output metadata for supported connectors") from the drm tree. I added the following merge fix patch: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 14 Jun 2019 14:27:12 +1000 Subject: [PATCH] fixup for "drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)