On Mon, Jul 06, 2020 at 11:17:34AM +0200, Martin Ziemer wrote:
> On Wed, Jul 01, 2020 at 01:47:57PM +1000, Jonathan Gray wrote:
> > On Tue, Jun 30, 2020 at 07:10:10PM +0200, Martin Ziemer wrote:
> > > With this patch (and driver "intel" in /etc/X11/xorg.conf) my system
> > > works.
> > > Tested suspend/resume and normal browsing.
> >
> > Thanks for testing, I've committed this with a comment added.
> Used the kernel i tested tuesday last week until today morning
> without getting problems.
>
> Then i switched to a daily snapshot and got a kernel panic.
>
> The kernel is:
> OpenBSD 6.7-current (GENERIC) #317: Sun Jul 5 20:02:17 MDT 2020
>
> The crash message is:
> kernel: page fault trap, code=0
> Stopped at drm_atomic_set_fb_for_plane+0x56: movl 0x58(%rax),%edx
>
> I uploaded photos from ddb:
> https://photos.app.goo.gl/eqD2wg3hZcsCZGBb7
I can't reproduce this on a braswell nuc.
Does the following diff help?
Index: sys/dev/pci/drm/drm_fb_helper.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/drm/drm_fb_helper.c,v
retrieving revision 1.26
diff -u -p -r1.26 drm_fb_helper.c
--- sys/dev/pci/drm/drm_fb_helper.c 2 Jul 2020 03:31:23 -0000 1.26
+++ sys/dev/pci/drm/drm_fb_helper.c 6 Jul 2020 13:39:50 -0000
@@ -1958,7 +1958,7 @@ EXPORT_SYMBOL(drm_fb_helper_initial_conf
*/
int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper)
{
- struct fb_info *fbi = fb_helper->fbdev;
+ struct fb_info *fbi;
int err = 0;
if (!drm_fbdev_emulation || !fb_helper)
@@ -1985,6 +1985,7 @@ int drm_fb_helper_hotplug_event(struct d
drm_setup_crtcs_fb(fb_helper);
mutex_unlock(&fb_helper->lock);
+ fbi = fb_helper->fbdev;
if (fbi->fbops && fbi->fbops->fb_set_par)
fbi->fbops->fb_set_par(fbi);
else
