Date: Wed, 02 Sep 2020 21:11:23 -0700 From: Ravi Pokala <rpokala@freebsd.org> To: Niclas Zeising <zeising@FreeBSD.org>, <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org> Subject: Re: svn commit: r365264 - head/sys/dev/drm2 Message-ID: <21223AE2-4D91-4DE4-90A5-CA991059FE2B@panasas.com> In-Reply-To: <202009021804.082I4nJ0098926@repo.freebsd.org> References: <202009021804.082I4nJ0098926@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This appears to have broken tinderbox:
[${SRCTOP}] rpokala% less _.arm.TEGRA124
...
${SRCTOP}/sys/dev/drm2/drm_os_freebsd.c:129:3: error: implicit declaration of function 'DRM_OBSOLETE' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
DRM_OBSOLETE(kdev);
^
1 error generated.
--- drm_os_freebsd.o ---
-Ravi (rpokala@)
-----Original Message-----
From: <owner-src-committers@freebsd.org> on behalf of Niclas Zeising <zeising@FreeBSD.org>
Date: 2020-09-02, Wednesday at 11:04
To: <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org>
Subject: svn commit: r365264 - head/sys/dev/drm2
Author: zeising (doc,ports committer)
Date: Wed Sep 2 18:04:49 2020
New Revision: 365264
URL: https://svnweb.freebsd.org/changeset/base/365264
Log:
drm2: Further improve deprecation message
Further improve the drm2 deprecation message, only displaying information
about the port for relevant architectures, and skipping the message
completely from arm, which uses some parts of drm2 still.
This is mostly intended to be merged to 12, since the base bits of drm2 on
FreeBSD 13 are only really used on arm.
Reviewed by: manu, mmel
Approved by: manu
MFC after: 3 days
X-MFC-with: r364737
Differential Revision: https://reviews.freebsd.org/D26275
Modified:
head/sys/dev/drm2/drm_os_freebsd.h
Modified: head/sys/dev/drm2/drm_os_freebsd.h
==============================================================================
--- head/sys/dev/drm2/drm_os_freebsd.h Wed Sep 2 17:46:56 2020 (r365263)
+++ head/sys/dev/drm2/drm_os_freebsd.h Wed Sep 2 18:04:49 2020 (r365264)
@@ -154,15 +154,21 @@ typedef void irqreturn_t;
*(volatile u_int64_t *)(((vm_offset_t)(map)->handle) + \
(vm_offset_t)(offset)) = htole64(val)
-#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_MSG "This code is deprecated."
+#endif
#define DRM_OBSOLETE(dev) \
do { \
device_printf(dev, "=======================================================\n"); \
- device_printf(dev, "This code is deprecated. 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?21223AE2-4D91-4DE4-90A5-CA991059FE2B>
