From owner-svn-src-head@freebsd.org Wed Sep 27 19:35:53 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F364BE0D80C for ; Wed, 27 Sep 2017 19:35:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-io0-x22c.google.com (mail-io0-x22c.google.com [IPv6:2607:f8b0:4001:c06::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C5F5183DB5 for ; Wed, 27 Sep 2017 19:35:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-io0-x22c.google.com with SMTP id g32so16644924ioj.2 for ; Wed, 27 Sep 2017 12:35:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=dQa0eQe6WPP6+drCMq8JOmP1nEyy+QEW1EP7NEPioPM=; b=xwpKfasn7BlVFxvdi/1wCid74yZTNGItG8GucWyhC3nzHXkeBsC/CgbZrL8+y+Jj/u hqRUsm06AHKCLFeY1wSIgNsn1bvP4mrGh+I6LQRQm6gVj23P89Z4ly0SZKg0lE1M4NYp 92IP0i7JoJj+IGag3B3af6msWG6/VNuQwIhqvNbhtxIZsiVa15Bf1MiHnjdod1wnMIO1 naVSavVVRm5NGDigpRApCcFGuZJK7egXDtjP+yneZmqEbU2MI7YQHXSQz0dmFXoOuDxx 5is9b1A4C2aKqnrZG6RKpSpCOENmhU7hrZTuXq3Gq9cS6oDZf8K3EryH60UZyva+kwuW 1lVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=dQa0eQe6WPP6+drCMq8JOmP1nEyy+QEW1EP7NEPioPM=; b=GRRhvsBGTyWFpPhejepeKB8GkGYta1+PbMKwl7SLhkKO8DnGW3ylqVMD0dRRrpdm6V V8pXhr3EnCCK/8KQFfTvcyct7sAa4jFE+kSS/XQq/OrsFktDRilHFGsTxdYfJk/oc5xl fktp1TuD+g6u+KlCE7lLhox1iH+GanP5+/E7PbVg6pztQvUs8KUFJ/8rluAND+KTgncf l4Ozs+2rGVWLw+fUgPPHCjLbPXjxQmyN7kWeDA3iwq0g9QJXzieyLa1dtMXUC2iNjFmQ WX8VnXueOzNt9fNvVaRqvkMnGyrYSp9mMyxurPKhN+u991wNMORkofNIYaOF6pp26AYT pNyQ== X-Gm-Message-State: AMCzsaW8M4h9JWGS2Nyd4a5b4pp0T8w8e1ltKKA3RvAsyHEPIaVCA4Cy ZEoQ533lpnDJwmyQYbglKWC8jXzAqmayzy8C+/EoTQ== X-Google-Smtp-Source: AOwi7QD1e9cLdJkExtFd6xApjXyuRWfkWeMUjam/IRiy59coD5MhB4RVMGc/ZF4lwg1A6F3lycW52jwD6mkDlceh4rg= X-Received: by 10.107.135.147 with SMTP id r19mr3932140ioi.26.1506540953021; Wed, 27 Sep 2017 12:35:53 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 10.79.2.194 with HTTP; Wed, 27 Sep 2017 12:35:46 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:f996:822c:89a6:8ee4] In-Reply-To: <201709271914.v8RJE0nn008894@repo.freebsd.org> References: <201709271914.v8RJE0nn008894@repo.freebsd.org> From: Warner Losh Date: Wed, 27 Sep 2017 13:35:46 -0600 X-Google-Sender-Auth: -BrO-Zy1HmohqB1cSSLugwbfOjQ Message-ID: Subject: Re: svn commit: r324067 - in head/sys/dev/drm2: i915 radeon To: Conrad Meyer Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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: Wed, 27 Sep 2017 19:35:54 -0000 On Wed, Sep 27, 2017 at 1:14 PM, Conrad Meyer wrote: > Author: cem > Date: Wed Sep 27 19:14:00 2017 > New Revision: 324067 > URL: https://svnweb.freebsd.org/changeset/base/324067 > > Log: > Unrevert r324059 > > With a colon and bogus name ("#") added to appease the simplistic parser > used in kldxref. > '#' isn't a bogus name. It's the name reserved for 'ignore this'. Warner > Sponsored by: Dell EMC Isilon > > Modified: > head/sys/dev/drm2/i915/i915_drv.c > head/sys/dev/drm2/radeon/radeon_drv.c > > Modified: head/sys/dev/drm2/i915/i915_drv.c > ============================================================ > ================== > --- head/sys/dev/drm2/i915/i915_drv.c Wed Sep 27 17:46:38 2017 > (r324066) > +++ head/sys/dev/drm2/i915/i915_drv.c Wed Sep 27 19:14:00 2017 > (r324067) > @@ -1236,6 +1236,8 @@ MODULE_DEPEND(i915kms, agp, 1, 1, 1); > MODULE_DEPEND(i915kms, iicbus, 1, 1, 1); > MODULE_DEPEND(i915kms, iic, 1, 1, 1); > MODULE_DEPEND(i915kms, iicbb, 1, 1, 1); > +MODULE_PNP_INFO("U32:vendor;U32:device;P:#;D:human", vgapci, i915, > pciidlist, > + sizeof(pciidlist[0]), nitems(pciidlist)); > > /* We give fast paths for the really cool registers */ > #define NEEDS_FORCE_WAKE(dev_priv, reg) \ > > Modified: head/sys/dev/drm2/radeon/radeon_drv.c > ============================================================ > ================== > --- head/sys/dev/drm2/radeon/radeon_drv.c Wed Sep 27 17:46:38 2017 > (r324066) > +++ head/sys/dev/drm2/radeon/radeon_drv.c Wed Sep 27 19:14:00 2017 > (r324067) > @@ -401,3 +401,5 @@ MODULE_DEPEND(radeonkms, iicbus, 1, 1, 1); > MODULE_DEPEND(radeonkms, iic, 1, 1, 1); > MODULE_DEPEND(radeonkms, iicbb, 1, 1, 1); > MODULE_DEPEND(radeonkms, firmware, 1, 1, 1); > +MODULE_PNP_INFO("U32:vendor;U32:device;P:#;D:human", vgapci, radeonkms, > + pciidlist, sizeof(pciidlist[0]), nitems(pciidlist)); > >