Module Name: src
Committed By: martin
Date: Sat Jun 3 15:13:48 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/i915drm [netbsd-10]: intelfb.c
Log Message:
Pull up following revision(s) (requested by nat in ticket #190):
sys/external/bsd/drm2/i915drm/intelfb.c: revision 1.25
Use the offset in mmap calculations.
It fixes wsfb(4) when used with intelfb(4).
Ok riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/external/bsd/drm2/i915drm/intelfb.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/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.24 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.24.4.1
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.24 Mon Jul 18 23:34:02 2022
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c Sat Jun 3 15:13:48 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: intelfb.c,v 1.24 2022/07/18 23:34:02 riastradh Exp $ */
+/* $NetBSD: intelfb.c,v 1.24.4.1 2023/06/03 15:13:48 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.24 2022/07/18 23:34:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.24.4.1 2023/06/03 15:13:48 martin Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -181,8 +181,8 @@ intelfb_drmfb_mmapfb(struct drmfb_softc
KASSERT(0 <= offset);
KASSERT(offset < vma->node.size);
- return bus_space_mmap(dev->bst, ggtt->gmadr.start, vma->node.start,
- prot, BUS_SPACE_MAP_PREFETCHABLE);
+ return bus_space_mmap(dev->bst, ggtt->gmadr.start,
+ vma->node.start + offset, prot, BUS_SPACE_MAP_PREFETCHABLE);
}
static void
