Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:54:03 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
src/sys/external/bsd/drm2/i915drm: i915_pci_autoconf.c
Log Message:
i915: Nix drm_dev_alloc, and do drm_pci_attach in i915_driver_probe.
i915 uses a struct drm_device embedded in struct drm_i915_private
now, so we can't allocate it separately.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.40 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.41
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.40 Sun Dec 19 11:26:35 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:54:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.40 2021/12/19 11:26:35 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.41 2021/12/19 11:54:03 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.40 2021/12/19 11:26:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.41 2021/12/19 11:54:03 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -1537,6 +1537,12 @@ int i915_driver_probe(struct pci_dev *pd
if (IS_ERR(dev_priv))
return PTR_ERR(dev_priv);
+#ifdef __NetBSD__
+ ret = drm_pci_attach(&dev_priv->drm, pdev);
+ if (ret)
+ goto out_destroy;
+#endif
+
/* Disable nuclear pageflip by default on pre-ILK */
if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)
dev_priv->drm.driver_features &= ~DRIVER_ATOMIC;
@@ -1605,9 +1611,13 @@ out_pci_disable:
#ifndef __NetBSD__
pci_disable_device(pdev);
out_fini:
+#endif
i915_probe_error(dev_priv, "Device initialization failed (%d)\n", ret);
- i915_driver_destroy(dev_priv);
+#ifdef __NetBSD__
+ drm_pci_detach(&dev_priv->drm);
+out_destroy:
#endif
+ i915_driver_destroy(dev_priv);
return ret;
}
@@ -1663,6 +1673,9 @@ static void i915_driver_release(struct d
intel_runtime_pm_driver_release(rpm);
i915_driver_late_release(dev_priv);
+#ifdef __NetBSD__
+ drm_pci_detach(dev);
+#endif
i915_driver_destroy(dev_priv);
}
Index: src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.7 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.8
--- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.7 Sun Dec 19 11:53:51 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 11:54:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci_autoconf.c,v 1.7 2021/12/19 11:53:51 riastradh Exp $ */
+/* $NetBSD: i915_pci_autoconf.c,v 1.8 2021/12/19 11:54:03 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.7 2021/12/19 11:53:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.8 2021/12/19 11:54:03 riastradh Exp $");
#include <sys/types.h>
#include <sys/queue.h>
@@ -180,22 +180,6 @@ i915drmkms_attach_real(device_t self)
/* Initialize the Linux PCI device descriptor. */
linux_pci_dev_init(&sc->sc_pci_dev, self, device_parent(self), pa, 0);
- sc->sc_drm_dev = drm_dev_alloc(i915_drm_driver, self);
- if (IS_ERR(sc->sc_drm_dev)) {
- aprint_error_dev(self, "unable to create drm device: %ld\n",
- PTR_ERR(sc->sc_drm_dev));
- sc->sc_drm_dev = NULL;
- return;
- }
-
- /* XXX errno Linux->NetBSD */
- error = -drm_pci_attach(sc->sc_drm_dev, &sc->sc_pci_dev);
- if (error) {
- aprint_error_dev(self, "unable to attach drm: %d\n", error);
- return;
- }
- sc->sc_pci_attached = true;
-
/* XXX errno Linux->NetBSD */
error = -i915_driver_probe(&sc->sc_pci_dev, ent);
if (error) {
@@ -203,6 +187,7 @@ i915drmkms_attach_real(device_t self)
return;
}
sc->sc_dev_registered = true;
+ sc->sc_drm_dev = pci_get_drvdata(&sc->sc_pci_dev);
while (!SIMPLEQ_EMPTY(&sc->sc_task_u.attach)) {
struct i915drmkms_task *const task =
@@ -243,14 +228,8 @@ i915drmkms_detach(device_t self, int fla
if (sc->sc_drm_dev == NULL)
goto out0;
- if (!sc->sc_pci_attached)
- goto out1;
- if (!sc->sc_dev_registered)
- goto out2;
-
- drm_dev_unregister(sc->sc_drm_dev);
-out2: drm_pci_detach(sc->sc_drm_dev);
-out1: drm_dev_put(sc->sc_drm_dev);
+
+ i915_driver_remove(sc->sc_drm_dev->dev_private);
sc->sc_drm_dev = NULL;
out0: linux_pci_dev_destroy(&sc->sc_pci_dev);
pmf_device_deregister(self);
