Module Name: src
Committed By: snj
Date: Thu Feb 11 23:28:05 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau [netbsd-7]:
nouveau_nv50_display.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.4.3 -r1.1.1.1.4.4 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.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/nouveau/nouveau_nv50_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.1.1.1.4.3 src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.1.1.1.4.4
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c:1.1.1.1.4.3 Thu Feb 11 23:20:11 2016
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_nv50_display.c Thu Feb 11 23:28:05 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_nv50
*/
# 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)
{
