Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:18:44 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
Exclude call to dma_set_max_seg_size
We probably don't need to replicate this.
Author: Maya Rashish <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 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.34 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.35
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.34 Sun Dec 19 11:18:35 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:18:44 2021
@@ -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 @@ static int i915_driver_hw_probe(struct d
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 */
