From nobody Thu Aug 01 23:18:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WZlHy0qLdz5RfXW; Thu, 01 Aug 2024 23:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZlHx5bg8z4rJM; Thu, 1 Aug 2024 23:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722554285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wNs1nxoMqfxdlTK2QwMo/IP/Iz6OTLV/tpdyTjvh28g=; b=sOsTd79duve6tFYzQCsveSpRSarlAP5g2BKhhZk3L+Whyhs3SBLceVYYAJV6l3+QD254Qx QNXA5Xr6vZvtk8dtyXSpP/Ac4WAGO1k5KgZ0wRNDBqP0ta33QP35rVufaOUWGA/Mdzoezb P41PwoM4YOBD3FhLGZCaS0MIqnPf7aK8GT5HfVMDjAK5XBySisasX7T1m2Ew4SJal/xYwN JMe4YcVgV7+rucXK625h3Kv0QzGv4Sjzxs0Sl232JHx0mtaS5fPOV/WQhqg+yt+49X81Zn SmWttdrsv6HBt8bkvlQC+WM+mT7sQZeaqQzP3e0f4MjSOq37xWj74kO/7+5WlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722554285; a=rsa-sha256; cv=none; b=eblMvlw9Dcp5yfc9mmkozxW59VLZfPubInyrPQPp5ZmBTkclnn3wpIhymLyy8+oxvYiu4G x3YjfYR1I7qsY50PkpgrKctf806/pENX4DV4MddX65imo84eSWdDX5oS+JCyb2RTfqEGHR tMc6wOD9GOUrNzF0GU7vL+n9kXrJk6AJE5D5XjKQ0MsBXE8yh3UJPXGQR/WMm0oX1PFTGX aYgs+P8lb+OcvaTmg2D+riW6nedzAPGEhyMZ8TlwmhB44nKkZ0qP8K93z0F3oi4UXRkj6r B+/0VsBIFHekQacxtpWKbzTL/xWAusr57DAiLlZAB692kT5dWmzk/3AzMWqNyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722554285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wNs1nxoMqfxdlTK2QwMo/IP/Iz6OTLV/tpdyTjvh28g=; b=XNA8tGKfBwu7idxSvgqDnY3hNFnm8fSucctLphXyD980DgzGANmThtjWXlp6Nj1iF4SA8y EQXzoXX0cdUKdzurMXI9GkfU6Cl3Xm7DSHpFAGLhxJKZ8sCo9gQhxKGVcqH7Mblg7d2Gja h3AwPydmVx5L8eC7qKJjU7bWvnynUhG5d/el9ZMeXT8kZekAV/C/0npDH2whT/oiD6c5G+ xCF7udcCZSXC0w7LoocHIZacCI2GnvMo0tBDYQdW0AmkcYDmga6sFjnAH0QEgP0BdzadxP YyRFxvJi3XFuniSrjSLnLPSLn3hUU0HUd9ulZxWS6/KR7/FDpTMwYWsiEUN1lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WZlHx54Lwz14Cg; Thu, 1 Aug 2024 23:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471NI5g0014110; Thu, 1 Aug 2024 23:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471NI5rT014107; Thu, 1 Aug 2024 23:18:05 GMT (envelope-from git) Date: Thu, 1 Aug 2024 23:18:05 GMT Message-Id: <202408012318.471NI5rT014107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5eb1ab19a359 - stable/13 - Revert "LinuxKPI: Automatically enable drm support for devices named "drmn"" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5eb1ab19a359a9639627686ba6af6c02d6ce1cf8 Auto-Submitted: auto-generated The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5eb1ab19a359a9639627686ba6af6c02d6ce1cf8 commit 5eb1ab19a359a9639627686ba6af6c02d6ce1cf8 Author: Vladimir Kondratyev AuthorDate: 2024-08-01 23:12:32 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-08-01 23:12:32 +0000 Revert "LinuxKPI: Automatically enable drm support for devices named "drmn"" This reverts commit 85da0abada244f90dc6e9ce36c75492f0aa9bf02. It is based on other not MFC-ed commit. --- sys/compat/linuxkpi/common/src/linux_pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 459f03f7e2a4..5f7296d66ee9 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -752,8 +752,7 @@ linux_pci_register_driver(struct pci_driver *pdrv) { devclass_t dc; - pdrv->isdrm = strcmp(pdrv->name, "drmn") == 0; - dc = pdrv->isdrm ? devclass_create("vgapci") : devclass_find("pci"); + dc = devclass_find("pci"); if (dc == NULL) return (-ENXIO); return (_linux_pci_register_driver(pdrv, dc)); @@ -908,7 +907,7 @@ linux_pci_unregister_driver(struct pci_driver *pdrv) { devclass_t bus; - bus = devclass_find(pdrv->isdrm ? "vgapci" : "pci"); + bus = devclass_find("pci"); spin_lock(&pci_lock); list_del(&pdrv->node);