On 17 May 2018 at 14:42, Dave Airlie <airlied@xxxxxxxxx> wrote: > On 16 May 2018 at 01:37, Laurent Pinchart > <laurent.pinchart@xxxxxxxxxxxxxxxx> wrote: >> Hello, >> >> On Tuesday, 15 May 2018 17:24:52 EEST kbuild test robot wrote: >>> tree: git://anongit.freedesktop.org/drm/drm-tip drm-tip >>> head: c03987223c762e4a61142f0a9be6027bb181cdfa >>> commit: 9037d4b98b255979c6636045794775f5a89cc623 [711/734] Merge branch >>> 'drm/du/next' of git://linuxtv.org/pinchartl/media into drm-next config: >>> arm64-defconfig (attached as .config) >>> compiler: aarch64-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0 >>> reproduce: >>> wget >>> https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O >>> ~/bin/make.cross chmod +x ~/bin/make.cross >>> git checkout 9037d4b98b255979c6636045794775f5a89cc623 >>> # save the attached .config to linux build tree >>> make.cross ARCH=arm64 >>> >>> All errors (new ones prefixed by >>): >>> >>> drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function >> 'rcar_du_vsp_plane_atomic_duplicate_state': >>> >> drivers/gpu/drm/rcar-du/rcar_du_vsp.c:317:6: error: 'struct >>> >> rcar_du_vsp_plane_state' has no member named 'alpha' >>> copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha; >>> ^~ >>> drivers/gpu/drm/rcar-du/rcar_du_vsp.c:317:53: error: 'struct >>> rcar_du_vsp_plane_state' has no member named 'alpha' copy->alpha = >>> to_rcar_vsp_plane_state(plane->state)->alpha; >>> ^~ >> >> This error is caused by a conflict between commit 75a07f399cd4 (drm: rcar-du: >> Zero-out sg_tables when duplicating plane state) present in my R-Car DU pull >> request sent for the DRM tree and commit 301a9b8d5456 ("drm/rcar-du: Convert >> to the new generic alpha property") present in drm-misc-next but not merged in >> the drm tree yet. >> >> Dave, how would you like to handle this ? I can rebase my drm/du/next branch >> on top of your tree once you merge drm-misc-next and send a new pull request, >> but I'd like to avoid missing the v4.18 merge window. Another option would be >> to handle the error in the drm-misc-next merge. If there's an easier option, >> please let me know how I can help. >> > > Is this broken in my tree now? since I seem to have both of these patches and my > local arm build succeeds. > > Is there a merge from somewhere else confusing things? Turns out my arm64 builds weren't setup properly, I've fixed them up and can now see builds failures. I've applied both rcar-du fixes to drm-next. Dave. _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
