Date: Sun, 6 Sep 2020 11:29:06 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365377 - stable/12/sys/dev/drm2 Message-ID: <202009061129.086BT6jh027152@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising (doc,ports committer) Date: Sun Sep 6 11:29:06 2020 New Revision: 365377 URL: https://svnweb.freebsd.org/changeset/base/365377 Log: MFC: r364737, r365264 and r365287 Together, these three revisions improve the drm2 (aka legacy drm or drm-legacy) drivers to point towards graphics/drm-kmod where relevant, and to remove references to graphics/drm-legacy-kmd as that is being deprecated. Since part of the drm2 drivers are still used on arm, arm is currently excluded from the deprecation message. Approved by: imp, manu (implicit, MFC) Modified: stable/12/sys/dev/drm2/drm_os_freebsd.c stable/12/sys/dev/drm2/drm_os_freebsd.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/drm2/drm_os_freebsd.c ============================================================================== --- stable/12/sys/dev/drm2/drm_os_freebsd.c Sun Sep 6 11:23:58 2020 (r365376) +++ stable/12/sys/dev/drm2/drm_os_freebsd.c Sun Sep 6 11:29:06 2020 (r365377) @@ -126,7 +126,9 @@ drm_probe_helper(device_t kdev, const drm_pci_id_list_ device_get_nameunit(kdev), id_entry->name); device_set_desc(kdev, id_entry->name); } +#if !defined(__arm__) DRM_OBSOLETE(kdev); +#endif return (-BUS_PROBE_GENERIC); } Modified: stable/12/sys/dev/drm2/drm_os_freebsd.h ============================================================================== --- stable/12/sys/dev/drm2/drm_os_freebsd.h Sun Sep 6 11:23:58 2020 (r365376) +++ stable/12/sys/dev/drm2/drm_os_freebsd.h Sun Sep 6 11:29:06 2020 (r365377) @@ -154,19 +154,21 @@ typedef void irqreturn_t; *(volatile u_int64_t *)(((vm_offset_t)(map)->handle) + \ (vm_offset_t)(offset)) = htole64(val) -#ifdef amd64 -#define DRM_PORT "graphics/drm-kmod" +#if !defined(__arm__) +#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || defined(__aarch64__) +#define DRM_MSG "This code is deprecated. Install the graphics/drm-kmod pkg\n" #else -#define DRM_PORT "graphics/drm-legacy-kmod" +#define DRM_MSG "This code is deprecated." #endif #define DRM_OBSOLETE(dev) \ do { \ device_printf(dev, "=======================================================\n"); \ - device_printf(dev, "This code is obsolete abandonware. Install the " DRM_PORT " pkg\n"); \ + device_printf(dev, DRM_MSG); \ device_printf(dev, "=======================================================\n"); \ gone_in_dev(dev, 13, "drm2 drivers"); \ } while (0) +#endif /* __arm__ */ /* DRM_READMEMORYBARRIER() prevents reordering of reads. * DRM_WRITEMEMORYBARRIER() prevents reordering of writes.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009061129.086BT6jh027152>