From owner-svn-src-head@freebsd.org Thu Jul 19 20:37:04 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 812131049C29; Thu, 19 Jul 2018 20:37:04 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from d.mail.sonic.net (d.mail.sonic.net [64.142.111.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 126617AA58; Thu, 19 Jul 2018 20:37:03 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from helicon.physics.ucla.edu (helicon.physics.ucla.edu [169.232.156.253]) (authenticated bits=0) by d.mail.sonic.net (8.15.1/8.15.1) with ESMTPSA id w6JKQYUf025736 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Thu, 19 Jul 2018 13:26:34 -0700 Subject: Re: svn commit: r336514 - head/sys/dev/vt/hw/ofwfb To: Justin Hibbits , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201807192022.w6JKMkE6044331@repo.freebsd.org> From: Nathan Whitehorn Message-ID: <72e23592-9ff2-b373-f8cc-755c358989f5@freebsd.org> Date: Thu, 19 Jul 2018 13:26:33 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <201807192022.w6JKMkE6044331@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Sonic-CAuth: UmFuZG9tSVYjwzHTpWV7K19vd5XK6Y7xdvpYX3H3hh70IbJA0KFLlGqom/u4szQIj9TLLYhTHJ8GN2JeDhcN2IxxLKVwGm+awJfFnO2qbUM= X-Sonic-ID: C;kLxiB5KL6BG11IG7ftbltA== M;ElC7B5KL6BG11IG7ftbltA== X-Spam-Flag: No X-Sonic-Spam-Details: 0.0/5.0 by cerberusd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jul 2018 20:37:04 -0000 Isn't stdout-path supposed to contain a string rather than an ihandle? This code assumes it is an ihandle (or xref phandle), which I think is wrong. -Nathan On 07/19/18 13:22, Justin Hibbits wrote: > Author: jhibbits > Date: Thu Jul 19 20:22:46 2018 > New Revision: 336514 > URL: https://svnweb.freebsd.org/changeset/base/336514 > > Log: > ofwfb: Check for /chosen/stdout-path in addition to /chosen/stdout > > Some platforms use /chosen/stdout-path as the property containing the path to > the stdout node, not /chosen/stdout. > > Modified: > head/sys/dev/vt/hw/ofwfb/ofwfb.c > > Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c > ============================================================================== > --- head/sys/dev/vt/hw/ofwfb/ofwfb.c Thu Jul 19 20:20:43 2018 (r336513) > +++ head/sys/dev/vt/hw/ofwfb/ofwfb.c Thu Jul 19 20:22:46 2018 (r336514) > @@ -102,6 +102,10 @@ ofwfb_probe(struct vt_device *vd) > if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == > sizeof(stdout)) > node = OF_instance_to_package(stdout); > + if (node == -1) > + if (OF_getprop(chosen, "stdout-path", &stdout, sizeof(stdout)) == > + sizeof(stdout)) > + node = OF_instance_to_package(stdout); > if (node == -1) { > /* > * The "/chosen/stdout" does not exist try >