Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:26:30 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h intel_opregion.c
Log Message:
Use a prefetchable linear bus space mapping. No __iomem.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.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.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.19 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.20
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.19 Mon Aug 27 07:19:01 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Mon Aug 27 07:26:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.h,v 1.19 2018/08/27 07:19:01 riastradh Exp $ */
+/* $NetBSD: i915_drv.h,v 1.20 2018/08/27 07:26:30 riastradh Exp $ */
/* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
*/
@@ -475,6 +475,10 @@ struct opregion_asle;
#endif
struct intel_opregion {
+#ifdef __NetBSD__
+ bus_space_tag_t bst;
+ bus_space_handle_t bsh;
+#endif
struct opregion_header *header;
struct opregion_acpi *acpi;
struct opregion_swsci *swsci;
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c:1.12 Mon Aug 27 06:34:44 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_opregion.c Mon Aug 27 07:26:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_opregion.c,v 1.12 2018/08/27 06:34:44 riastradh Exp $ */
+/* $NetBSD: intel_opregion.c,v 1.13 2018/08/27 07:26:30 riastradh Exp $ */
/*
* Copyright 2008 Intel Corporation <[email protected]>
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.12 2018/08/27 06:34:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_opregion.c,v 1.13 2018/08/27 07:26:30 riastradh Exp $");
#include <linux/printk.h>
#include <linux/acpi.h>
@@ -600,7 +600,7 @@ static void
intel_opregion_video_event(ACPI_HANDLE hdl, uint32_t notify, void *opaque)
{
device_t self = opaque;
- struct opregion_acpi __iomem *acpi;
+ struct opregion_acpi *acpi;
DRM_DEBUG_DRIVER("notify=0x%08x\n", notify);
@@ -647,9 +647,11 @@ static int intel_opregion_video_event(st
}
#endif
+#ifndef __NetBSD__
static struct notifier_block intel_opregion_notifier = {
.notifier_call = intel_opregion_video_event,
};
+#endif
/*
* Initialise the DIDL field in opregion. This passes a list of devices to
@@ -895,7 +897,11 @@ void intel_opregion_fini(struct drm_devi
}
/* just clear all opregion memory pointers now */
+#ifdef __NetBSD__
+ bus_space_unmap(opregion->bst, opregion->bsh, OPREGION_SIZE);
+#else
memunmap(opregion->header);
+#endif
opregion->header = NULL;
opregion->acpi = NULL;
opregion->swsci = NULL;
@@ -989,7 +995,14 @@ int intel_opregion_setup(struct drm_devi
INIT_WORK(&opregion->asle_work, asle_work);
#endif
#ifdef __NetBSD__
- base = acpi_os_ioremap(asls, OPREGION_SIZE);
+ opregion->bst = dev->pdev->pd_pa.pa_memt;
+ err = -bus_space_map(opregion->bst, asls, OPREGION_SIZE,
+ BUS_SPACE_MAP_LINEAR|BUS_SPACE_MAP_PREFETCHABLE, &opregion->bsh);
+ if (err) {
+ DRM_DEBUG_DRIVER("Failed to map opregion: %d", err);
+ return err;
+ }
+ base = bus_space_vaddr(opregion->bst, opregion->bsh);
#else
base = memremap(asls, OPREGION_SIZE, MEMREMAP_WB);
#endif
@@ -1029,7 +1042,11 @@ int intel_opregion_setup(struct drm_devi
return 0;
err_out:
+#ifdef __NetBSD__
+ bus_space_unmap(opregion->bst, opregion->bsh, OPREGION_SIZE);
+#else
memunmap(base);
+#endif
return err;
}
