svn commit: r324067 - in head/sys/dev/drm2: i915 radeon

[Warner Losh]

On Wed, Sep 27, 2017 at 1:14 PM, Conrad Meyer <cem at freebsd.org> 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));
>
>