Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Fix drm_dev_init a...



details:   https://anonhg.NetBSD.org/src/rev/45bada789422
branches:  trunk
changeset: 1028559:45bada789422
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:19:32 2021 +0000

description:
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.

diffstat:

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

diffs (27 lines):

diff -r 63d51c001f20 -r 45bada789422 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:19:24 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:19:32 2021 +0000
@@ -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 @@
        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);



Home | Main Index | Thread Index | Old Index