Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:50:23 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device:
nouveau_nvkm_engine_device_base.c
Log Message:
Match Linux's criterion for byte-swapping on big-endian CPUs.
(forward-ported from r1.10 on HEAD)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.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/nvkm/engine/device/nouveau_nvkm_engine_device_base.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.11 src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c:1.11 Sat Dec 18 23:45:34 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c Sun Dec 19 10:50:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.11 2021/12/18 23:45:34 riastradh Exp $ */
+/* $NetBSD: nouveau_nvkm_engine_device_base.c,v 1.12 2021/12/19 10:50:22 riastradh Exp $ */
/*
* Copyright 2012 Red Hat Inc.
@@ -24,7 +24,7 @@
* Authors: Ben Skeggs
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.11 2021/12/18 23:45:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_nvkm_engine_device_base.c,v 1.12 2021/12/19 10:50:22 riastradh Exp $");
#include "priv.h"
#include "acpi.h"
@@ -3016,7 +3016,7 @@ nvkm_device_ctor(const struct nvkm_devic
#ifndef __BIG_ENDIAN
if (bus_space_read_stream_4(mmiot, mmioh, 4) != 0)
#else
- if (bus_space_read_stream_4(mmiot, mmioh, 4) != 1)
+ if (bus_space_read_stream_4(mmiot, mmioh, 4) == 0)
#endif
{
bus_space_write_stream_4(mmiot, mmioh, 4, 0x01000001);
