[src/netbsd-7-1]: src/sys/external/bsd/drm2/drm Pull up following revision(s)...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5795fc3069ff
branches:  netbsd-7-1
changeset: 800831:5795fc3069ff
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jan 03 20:46:45 2018 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #1536):
        sys/external/bsd/drm2/drm/drm_drv.c: 1.20
drm_stat: fix device minor calculation, ok riastradh@

diffstat:

 sys/external/bsd/drm2/drm/drm_drv.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 3a8d2b69a097 -r 5795fc3069ff sys/external/bsd/drm2/drm/drm_drv.c
--- a/sys/external/bsd/drm2/drm/drm_drv.c       Wed Jan 03 20:30:07 2018 +0000
+++ b/sys/external/bsd/drm2/drm/drm_drv.c       Wed Jan 03 20:46:45 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.9.2.5 2016/02/11 23:14:41 snj Exp $      */
+/*     $NetBSD: drm_drv.c,v 1.9.2.5.4.1 2018/01/03 20:46:45 snj Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.9.2.5 2016/02/11 23:14:41 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.9.2.5.4.1 2018/01/03 20:46:45 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -579,7 +579,7 @@
        struct drm_file *const file = fp->f_data;
        struct drm_minor *const dminor = file->minor;
        const dev_t devno = makedev(cdevsw_lookup_major(&drm_cdevsw),
-           64*dminor->index + dminor->type);
+           64*dminor->type + dminor->index);
 
        (void)memset(st, 0, sizeof(*st));