From owner-svn-src-head@freebsd.org  Sun Oct 15 16:08:24 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1034AE45F12;
 Sun, 15 Oct 2017 16:08:24 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D21347EA19;
 Sun, 15 Oct 2017 16:08:23 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9FG8NGj091348;
 Sun, 15 Oct 2017 16:08:23 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9FG8NPc091347;
 Sun, 15 Oct 2017 16:08:23 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201710151608.v9FG8NPc091347@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 15 Oct 2017 16:08:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324629 - head/sys/compat/linux
X-SVN-Group: head
X-SVN-Commit-Author: tijl
X-SVN-Commit-Paths: head/sys/compat/linux
X-SVN-Commit-Revision: 324629
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Oct 2017 16:08:24 -0000

Author: tijl
Date: Sun Oct 15 16:08:22 2017
New Revision: 324629
URL: https://svnweb.freebsd.org/changeset/base/324629

Log:
  Add special handling for current in-tree drm devices, like r323692 added
  for drm-next.

Modified:
  head/sys/compat/linux/linux_util.c

Modified: head/sys/compat/linux/linux_util.c
==============================================================================
--- head/sys/compat/linux/linux_util.c	Sun Oct 15 16:03:45 2017	(r324628)
+++ head/sys/compat/linux/linux_util.c	Sun Oct 15 16:08:22 2017	(r324629)
@@ -146,6 +146,27 @@ linux_driver_get_major_minor(const char *node, int *ma
 		return (0);
 	}
 
+	sz = sizeof("dri/card") - 1;
+	if (strncmp(node, "dri/card", sz) == 0 && node[sz] != '\0') {
+		devno = strtoul(node + sz, NULL, 10);
+		*major = 226 + (devno / 256);
+		*minor = devno % 256;
+		return (0);
+	}
+	sz = sizeof("dri/controlD") - 1;
+	if (strncmp(node, "dri/controlD", sz) == 0 && node[sz] != '\0') {
+		devno = strtoul(node + sz, NULL, 10);
+		*major = 226 + (devno / 256);
+		*minor = devno % 256;
+		return (0);
+	}
+	sz = sizeof("dri/renderD") - 1;
+	if (strncmp(node, "dri/renderD", sz) == 0 && node[sz] != '\0') {
+		devno = strtoul(node + sz, NULL, 10);
+		*major = 226 + (devno / 256);
+		*minor = devno % 256;
+		return (0);
+	}
 	sz = sizeof("drm/") - 1;
 	if (strncmp(node, "drm/", sz) == 0 && node[sz] != '\0') {
 		devno = strtoul(node + sz, NULL, 10);