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 Exclude call to dma_set_...



details:   https://anonhg.NetBSD.org/src/rev/40f56faa3eed
branches:  trunk
changeset: 1028553:40f56faa3eed
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:18:44 2021 +0000

description:
Exclude call to dma_set_max_seg_size

We probably don't need to replicate this.


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

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

diffs (32 lines):

diff -r 149b850752de -r 40f56faa3eed 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:18:35 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:18:44 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.c,v 1.34 2021/12/19 11:18:35 riastradh Exp $  */
+/*     $NetBSD: i915_drv.c,v 1.35 2021/12/19 11:18:44 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.34 2021/12/19 11:18:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.35 2021/12/19 11:18:44 riastradh Exp $");
 
 #include <linux/acpi.h>
 #include <linux/device.h>
@@ -1241,11 +1241,13 @@
 
        pci_set_master(pdev);
 
+#ifdef __linux__
        /*
         * We don't have a max segment size, so set it to the max so sg's
         * debugging layer doesn't complain
         */
        dma_set_max_seg_size(&pdev->dev, UINT_MAX);
+#endif
 
 #ifndef __NetBSD__             /* Handled in intel_ggtt.c.  */
        /* overlay on gen2 is broken and can't address above 1G */



Home | Main Index | Thread Index | Old Index