From: Eric Engestrom <eric.engestrom@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Subject: Re: [PATCH libdrm 1/3] xf86drm: dedupe `#define`s
Date: Mon, 18 Feb 2019 17:10:06 +0000 [thread overview]
Message-ID: <20190218171006.lcqlj6xupppamuhg@intel.com> (raw)
In-Reply-To: <20181219170803.23452-1-eric.engestrom@intel.com>
On Wednesday, 2018-12-19 17:08:01 +0000, Eric Engestrom wrote:
> Adapted from a local patch carried by DragonFlyBSD:
> https://github.com/DragonFlyBSD/DPorts/blob/bc056f88f7e4d468d8c9751f831a47b5ae1326e3/graphics/libdrm/files/patch-xf86drm.h
>
> Patch is sadly uncredited (a bot authored the commit), so I can't credit
> the author here either.
>
> Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Ping? :)
> ---
> xf86drm.c | 10 ----------
> xf86drm.h | 16 ++++++++++------
> 2 files changed, 10 insertions(+), 16 deletions(-)
>
> diff --git a/xf86drm.c b/xf86drm.c
> index 377ddf917d2cb902899a..07425b19897d00a19e8a 100644
> --- a/xf86drm.c
> +++ b/xf86drm.c
> @@ -71,16 +71,6 @@
>
> #include "util_math.h"
>
> -#ifdef __OpenBSD__
> -#define DRM_PRIMARY_MINOR_NAME "drm"
> -#define DRM_CONTROL_MINOR_NAME "drmC"
> -#define DRM_RENDER_MINOR_NAME "drmR"
> -#else
> -#define DRM_PRIMARY_MINOR_NAME "card"
> -#define DRM_CONTROL_MINOR_NAME "controlD"
> -#define DRM_RENDER_MINOR_NAME "renderD"
> -#endif
> -
> #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
> #define DRM_MAJOR 145
> #endif
> diff --git a/xf86drm.h b/xf86drm.h
> index 7773d71a803084e86920..18668ff3d40d7db55c95 100644
> --- a/xf86drm.h
> +++ b/xf86drm.h
> @@ -78,17 +78,21 @@ extern "C" {
>
> #ifdef __OpenBSD__
> #define DRM_DIR_NAME "/dev"
> -#define DRM_DEV_NAME "%s/drm%d"
> -#define DRM_CONTROL_DEV_NAME "%s/drmC%d"
> -#define DRM_RENDER_DEV_NAME "%s/drmR%d"
> +#define DRM_PRIMARY_MINOR_NAME "drm"
> +#define DRM_CONTROL_MINOR_NAME "drmC"
> +#define DRM_RENDER_MINOR_NAME "drmR"
> #else
> #define DRM_DIR_NAME "/dev/dri"
> -#define DRM_DEV_NAME "%s/card%d"
> -#define DRM_CONTROL_DEV_NAME "%s/controlD%d"
> -#define DRM_RENDER_DEV_NAME "%s/renderD%d"
> +#define DRM_PRIMARY_MINOR_NAME "card"
> +#define DRM_CONTROL_MINOR_NAME "controlD"
> +#define DRM_RENDER_MINOR_NAME "renderD"
> #define DRM_PROC_NAME "/proc/dri/" /* For backward Linux compatibility */
> #endif
>
> +#define DRM_DEV_NAME "%s/" DRM_PRIMARY_MINOR_NAME "%d"
> +#define DRM_CONTROL_DEV_NAME "%s/" DRM_CONTROL_MINOR_NAME "%d"
> +#define DRM_RENDER_DEV_NAME "%s/" DRM_RENDER_MINOR_NAME "%d"
> +
> #define DRM_ERR_NO_DEVICE (-1001)
> #define DRM_ERR_NO_ACCESS (-1002)
> #define DRM_ERR_NOT_ROOT (-1003)
> --
> Cheers,
> Eric
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-02-18 17:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-19 17:08 [PATCH libdrm 1/3] xf86drm: dedupe `#define`s Eric Engestrom
2018-12-19 17:08 ` [PATCH libdrm 2/3] xf86drm: use max size of drm node name instead of arbitrary size Eric Engestrom
2018-12-19 17:08 ` [PATCH libdrm 3/3] xf86drm: dedupe drmGetDeviceName() logic Eric Engestrom
2019-02-18 17:10 ` Eric Engestrom [this message]
2019-02-19 11:46 ` [PATCH libdrm 1/3] xf86drm: dedupe `#define`s Emil Velikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190218171006.lcqlj6xupppamuhg@intel.com \
--to=eric.engestrom@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emil.l.velikov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox