Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:19:33 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
i915: Fix drm_dev_init argument.
Confusingly the parameter is named `parent' but means the struct
device that corresponds to the struct pci_dev. Use pci_dev_dev here
since it works in both APIs.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.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.38 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.39
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.38 Sun Dec 19 11:19:09 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:19:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.38 2021/12/19 11:19:09 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.39 2021/12/19 11:19:32 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.38 2021/12/19 11:19:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.39 2021/12/19 11:19:32 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -1483,7 +1483,7 @@ i915_driver_create(struct pci_dev *pdev,
if (!i915)
return ERR_PTR(-ENOMEM);
- err = drm_dev_init(&i915->drm, &driver, device_parent(pdev->pd_dev));
+ err = drm_dev_init(&i915->drm, &driver, pci_dev_dev(pdev));
if (err) {
kfree(i915);
return ERR_PTR(err);
