[src/netbsd-10]: src/sys/external/bsd/drm2/i915drm Pull up following revision...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9714d9f042f0
branches:  netbsd-10
changeset: 376162:9714d9f042f0
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jun 03 15:13:48 2023 +0000

description:
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@

diffstat:

 sys/external/bsd/drm2/i915drm/intelfb.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r cee6f217c0b3 -r 9714d9f042f0 sys/external/bsd/drm2/i915drm/intelfb.c
--- a/sys/external/bsd/drm2/i915drm/intelfb.c   Sat Jun 03 15:04:06 2023 +0000
+++ b/sys/external/bsd/drm2/i915drm/intelfb.c   Sat Jun 03 15:13:48 2023 +0000
@@ -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