From owner-svn-src-all@freebsd.org Mon Nov 30 08:31:42 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 627974738DE; Mon, 30 Nov 2020 08:31:42 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ckz3f2LZLz4kfN; Mon, 30 Nov 2020 08:31:42 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4397820717; Mon, 30 Nov 2020 08:31:42 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AU8Vg3J064036; Mon, 30 Nov 2020 08:31:42 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AU8VgPM064035; Mon, 30 Nov 2020 08:31:42 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <202011300831.0AU8VgPM064035@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Mon, 30 Nov 2020 08:31:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368169 - head/sys/dev/hyperv/vmbus X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/sys/dev/hyperv/vmbus X-SVN-Commit-Revision: 368169 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2020 08:31:42 -0000 Author: tsoome Date: Mon Nov 30 08:31:41 2020 New Revision: 368169 URL: https://svnweb.freebsd.org/changeset/base/368169 Log: fix vmbus_fb_mmio_res after r368168 mixed efifb versus vbefb struct use did slip in by mistake. Modified: head/sys/dev/hyperv/vmbus/vmbus.c Modified: head/sys/dev/hyperv/vmbus/vmbus.c ============================================================================== --- head/sys/dev/hyperv/vmbus/vmbus.c Mon Nov 30 08:22:40 2020 (r368168) +++ head/sys/dev/hyperv/vmbus/vmbus.c Mon Nov 30 08:31:41 2020 (r368169) @@ -1367,8 +1367,8 @@ vmbus_fb_mmio_res(device_t dev) fb_start = vbefb->fb_addr; fb_end = vbefb->fb_addr + vbefb->fb_size; fb_count = vbefb->fb_size; - fb_height = efifb->fb_height; - fb_width = efifb->fb_width; + fb_height = vbefb->fb_height; + fb_width = vbefb->fb_width; } else { fb_start = efifb->fb_addr; fb_end = efifb->fb_addr + efifb->fb_size; @@ -1376,6 +1376,7 @@ vmbus_fb_mmio_res(device_t dev) fb_height = efifb->fb_height; fb_width = efifb->fb_width; } + if (fb_start == 0) { if (bootverbose) device_printf(dev,