Thanks for your work :)I apply the h version of the patch on r279140 and it failed on some hunk (Same result as J.R Oldroyd)I will try to apply the patch manually and give you the resultsMy chip is Intel Corei7 4th gen (Haswell) K G+ : https://plus.google.com/u/0/+AlexandreKeledjian/posts Twitter: _at_dervyshe Blog: https://blogs.fsfe.org/dervishe/ Public key: https://keybase.io/dervishe/key.asc GitHub: https://github.com/dervishe-/ Le Samedi 21 février 2015 4h33, J.R. Oldroyd <fbsd_at_opal.com> a écrit : On Fri, 20 Feb 2015 15:49:44 +0100 Anders Bolt-Evensen <andersbo87_at_icloud.com> wrote: >> > I saw that you had updated your patchfile to drm-update-38.h.patch, and > ... > applied the patch, it seemed to be more successful, but on 22 occations > the patch still fails (the following list contains all the fails; the > entire output can be seen here: > > Hunk #2 failed at 29. > 1 out of 3 hunks failed--saving rejects to sys/dev/drm2/drm_agpsupport.c.rej > Hunk #2 failed at 31. > 1 out of 4 hunks failed--saving rejects to sys/dev/drm2/drm_auth.c.rej > Hunk #2 failed at 31. > 1 out of 26 hunks failed--saving rejects to sys/dev/drm2/drm_bufs.c.rej > Hunk #2 failed at 31. > 1 out of 17 hunks failed--saving rejects to sys/dev/drm2/drm_context.c.rej > Hunk #1 failed at 21. > 1 out of 39 hunks failed--saving rejects to sys/dev/drm2/drm_crtc.h.rej > Hunk #2 failed at 31. > 1 out of 5 hunks failed--saving rejects to sys/dev/drm2/drm_dma.c.rej > Hunk #1 failed at 0. > 1 out of 1 hunks failed--saving rejects to sys/dev/drm2/drm_drawable.c.rej > Hunk #2 failed at 44. > 1 out of 8 hunks failed--saving rejects to sys/dev/drm2/drm_drv.c.rej > Hunk #1 failed at 19. > 1 out of 5 hunks failed--saving rejects to sys/dev/drm2/drm_edid.h.rej > Hunk #1 failed at 21. > 1 out of 17 hunks failed--saving rejects to > sys/dev/drm2/drm_edid_modes.h.rej > Hunk #1 failed at 26. > 1 out of 7 hunks failed--saving rejects to sys/dev/drm2/drm_fb_helper.h.rej > Hunk #2 failed at 32. > 1 out of 9 hunks failed--saving rejects to sys/dev/drm2/drm_fops.c.rej > Hunk #1 failed at 19. > 1 out of 3 hunks failed--saving rejects to sys/dev/drm2/drm_fourcc.h.rej > Hunk #1 failed at 0. > 1 out of 1 hunks failed--saving rejects to sys/dev/drm2/drm_internal.h.rej > Hunk #2 failed at 31. > 1 out of 4 hunks failed--saving rejects to sys/dev/drm2/drm_ioctl.c.rej > Hunk #2 failed at 27. > 1 out of 50 hunks failed--saving rejects to sys/dev/drm2/drm_irq.c.rej > Hunk #2 failed at 31. > 1 out of 3 hunks failed--saving rejects to sys/dev/drm2/drm_lock.c.rej > Hunk #2 failed at 31. > 1 out of 2 hunks failed--saving rejects to sys/dev/drm2/drm_memory.c.rej > Hunk #1 failed at 25. > 1 out of 10 hunks failed--saving rejects to sys/dev/drm2/drm_mm.h.rej > Hunk #1 failed at 22. > 1 out of 11 hunks failed--saving rejects to sys/dev/drm2/drm_mode.h.rej > Hunk #1 failed at 0. > 1 out of 1 hunks failed--saving rejects to sys/dev/drm2/drm_sman.c.rej > Hunk #1 failed at 0. > 1 out of 1 hunks failed--saving rejects to sys/dev/drm2/drm_sman.h.rej > _______________________________________________ Same errors here. Applying patch to r279092 from svn master. Did you diff against the github source and is there perhaps some divergence between that and the svn master? I worked through the rejects and applied them manually. But, booting does not go well: Feb 20 21:58:22 xx kernel: panic: mtx_lock() of destroyed mutex _at_ /usr/src/sys/modules/drm2/drm2/../../../dev/drm2/drm_irq.c:1036 Feb 20 21:58:22 xx kernel: cpuid = 0 Feb 20 21:58:22 xx kernel: KDB: stack backtrace: Feb 20 21:58:22 xx kernel: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe00b2966600 Feb 20 21:58:22 xx kernel: vpanic() at vpanic+0x189/frame 0xfffffe00b2966680 Feb 20 21:58:22 xx kernel: kassert_panic() at kassert_panic+0x132/frame 0xfffffe00b29666f0 Feb 20 21:58:22 xx kernel: __mtx_lock_flags() at __mtx_lock_flags+0x14a/frame 0xfffffe00b2966740 Feb 20 21:58:22 xx kernel: drm_vblank_post_modeset() at drm_vblank_post_modeset+0x3f/frame 0xfffffe00b2966770 Feb 20 21:58:22 xx kernel: atombios_crtc_dpms() at atombios_crtc_dpms+0x208/frame 0xfffffe00b29667b0 Feb 20 21:58:22 xx kernel: atombios_crtc_commit() at atombios_crtc_commit+0x14/frame 0xfffffe00b29667e0 Feb 20 21:58:22 xx kernel: drm_crtc_helper_set_mode() at drm_crtc_helper_set_mode+0x480/frame 0xfffffe00b2966a30 Feb 20 21:58:22 xx kernel: drm_crtc_helper_set_config() at drm_crtc_helper_set_config+0x9c1/frame 0xfffffe00b2966b00 Feb 20 21:58:22 xx kernel: vt_restore_fbdev_mode() at vt_restore_fbdev_mode+0x4e/frame 0xfffffe00b2966b20 Feb 20 21:58:22 xx kernel: taskqueue_run_locked() at taskqueue_run_locked+0xf0/frame 0xfffffe00b2966b80 Feb 20 21:58:22 xx kernel: taskqueue_thread_loop() at taskqueue_thread_loop+0x9b/frame 0xfffffe00b2966bb0 Feb 20 21:58:22 xx kernel: fork_exit() at fork_exit+0x84/frame 0xfffffe00b2966bf0 Feb 20 21:58:22 xx kernel: fork_trampoline() at fork_trampoline+0xe/frame 0xfffffe00b2966bf0 Feb 20 21:58:22 xx kernel: --- trap 0, rip = 0, rsp = 0xfffffe00b2966cb0, rbp = 0 --- Feb 20 21:58:22 xx kernel: Uptime: 37s Feb 20 21:58:22 xx kernel: Dumping 236 out of 2915 MB:..7%..14%..21%..34%..41%..55%..61%..75%..82%..95% Feb 20 21:58:22 xx kernel: Dump complete Feb 20 21:58:22 xx kernel: Automatic reboot in 15 seconds - press a key on the console to abort Feb 20 21:58:22 xx kernel: Rebooting... I can also see earlier that the cp still did not init... same old CAFEDEAD in r100_cp_init. Chip is ATI Radeon RS690 X1270 IGP. -jr _______________________________________________ freebsd-current_at_freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscribe_at_freebsd.org"Received on Sun Feb 22 2015 - 10:03:02 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:55 UTC