From 03c13a2a152045c1ab12637061cddf1a0ad65700 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 20 Mar 2024 02:38:35 +0000 Subject: [PATCH] in vga_get_uninterruptible() return early if behind a bridge remove KASSERT() that triggered on dg2 --- sys/dev/pci/drm/drm_linux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c index f89e28c1114..7e548a78493 100644 --- a/sys/dev/pci/drm/drm_linux.c +++ b/sys/dev/pci/drm/drm_linux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: drm_linux.c,v 1.109 2024/01/21 13:36:40 kettenis Exp $ */ +/* $OpenBSD: drm_linux.c,v 1.110 2024/03/20 02:38:35 jsg Exp $ */ /* * Copyright (c) 2013 Jonathan Gray * Copyright (c) 2015, 2016 Mark Kettenis @@ -1302,7 +1302,8 @@ vga_disable_bridge(struct pci_attach_args *pa) void vga_get_uninterruptible(struct pci_dev *pdev, int rsrc) { - KASSERT(pdev->pci->sc_bridgetag == NULL); + if (pdev->pci->sc_bridgetag != NULL) + return; pci_enumerate_bus(pdev->pci, vga_disable_bridge, NULL); } -- 2.20.1