Source-Changes-HG archive

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

[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Use pci_dev_dev...



details:   https://anonhg.NetBSD.org/src/rev/38daa31e9db2
branches:  riastradh-drm2
changeset: 788342:38daa31e9db2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:20:37 2013 +0000

description:
Use pci_dev_dev to get at a pci_dev's device_t in i915_drm_freeze.

diffstat:

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

diffs (17 lines):

diff -r c2779ad05677 -r 38daa31e9db2 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Wed Jul 24 03:20:22 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Wed Jul 24 03:20:37 2013 +0000
@@ -484,8 +484,13 @@
        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
                int error = i915_gem_idle(dev);
                if (error) {
+#ifdef __NetBSD__
+                       dev_err(pci_dev_dev(dev->pdev),
+                           "GEM idle failed, resume might fail\n");
+#else
                        dev_err(&dev->pdev->dev,
                                "GEM idle failed, resume might fail\n");
+#endif
                        return error;
                }
 



Home | Main Index | Thread Index | Old Index