[src/netbsd-7]: src/sys/external/bsd/drm2/dist/drm/nouveau Pull up following ...

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

details:   https://anonhg.NetBSD.org/src/rev/ee6a241a5e2d
branches:  netbsd-7
changeset: 799797:ee6a241a5e2d
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Feb 11 23:28:05 2016 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1111):
        sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c: revision 1.5
Omit unused definition of readw.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c |  16 +---------
 1 files changed, 2 insertions(+), 14 deletions(-)

diffs (39 lines):

diff -r 29ba242fc39e -r ee6a241a5e2d sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c     Thu Feb 11 23:25:51 2016 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c     Thu Feb 11 23:28:05 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_nv50_display.c,v 1.1.1.1.4.3 2016/02/11 23:20:11 snj Exp $     */
+/*     $NetBSD: nouveau_nv50_display.c,v 1.1.1.1.4.4 2016/02/11 23:28:05 snj Exp $     */
 
        /*
  * Copyright 2011 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.1.1.1.4.3 2016/02/11 23:20:11 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nv50_display.c,v 1.1.1.1.4.4 2016/02/11 23:28:05 snj Exp $");
 
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
@@ -59,20 +59,8 @@
  */
 
 #  define      __iomem         volatile
-#  define      readw           fake_readw
 #  define      writew          fake_writew
 
-static inline uint32_t
-fake_readw(const void __iomem *ptr)
-{
-       uint16_t v;
-
-       v = *(const uint16_t __iomem *)ptr;
-       membar_consumer();
-
-       return v;
-}
-
 static inline void
 fake_writew(uint16_t v, void __iomem *ptr)
 {