diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-02-10 01:05:08 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-02-10 01:05:08 +0000 |
| commit | a6055c2b5b11395ce7a41d9ac5cc5de4534e328d (patch) | |
| tree | ebb0237c4dea064d50f136314f5692d98650ad0e | |
| parent | 0b07c3ff5e38e6cac47a4eb0cce038d9b4fd708a (diff) | |
drm/radeon: fix typo in CP DMA register headers
From Alex Deucher
1f549c8c9e500848ac4d79b6069baed001adfd18 in ubuntu 3.8
aa3e146d04b6ae37939daeebaec060562b3db559 in mainline linux
| -rw-r--r-- | sys/dev/pci/drm/radeon/evergreend.h | 6 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/r600d.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon/sid.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/pci/drm/radeon/evergreend.h b/sys/dev/pci/drm/radeon/evergreend.h index 659f36ca5a4..f4865ba49de 100644 --- a/sys/dev/pci/drm/radeon/evergreend.h +++ b/sys/dev/pci/drm/radeon/evergreend.h @@ -1,4 +1,4 @@ -/* $OpenBSD: evergreend.h,v 1.2 2013/09/01 10:36:31 jsg Exp $ */ +/* $OpenBSD: evergreend.h,v 1.3 2014/02/10 01:05:07 jsg Exp $ */ /* * Copyright 2010 Advanced Micro Devices, Inc. * @@ -1051,7 +1051,7 @@ * 6. COMMAND [29:22] | BYTE_COUNT [20:0] */ # define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20) - /* 0 - SRC_ADDR + /* 0 - DST_ADDR * 1 - GDS */ # define PACKET3_CP_DMA_ENGINE(x) ((x) << 27) @@ -1066,7 +1066,7 @@ # define PACKET3_CP_DMA_CP_SYNC (1 << 31) /* COMMAND */ # define PACKET3_CP_DMA_DIS_WC (1 << 21) -# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23) +# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22) /* 0 - none * 1 - 8 in 16 * 2 - 8 in 32 diff --git a/sys/dev/pci/drm/radeon/r600d.h b/sys/dev/pci/drm/radeon/r600d.h index 999fadb0d3d..934e4ef16bb 100644 --- a/sys/dev/pci/drm/radeon/r600d.h +++ b/sys/dev/pci/drm/radeon/r600d.h @@ -1,4 +1,4 @@ -/* $OpenBSD: r600d.h,v 1.1 2013/08/12 04:11:53 jsg Exp $ */ +/* $OpenBSD: r600d.h,v 1.2 2014/02/10 01:05:07 jsg Exp $ */ /* * Copyright 2009 Advanced Micro Devices, Inc. * Copyright 2009 Red Hat Inc. @@ -1197,7 +1197,7 @@ */ # define PACKET3_CP_DMA_CP_SYNC (1 << 31) /* COMMAND */ -# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23) +# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22) /* 0 - none * 1 - 8 in 16 * 2 - 8 in 32 diff --git a/sys/dev/pci/drm/radeon/sid.h b/sys/dev/pci/drm/radeon/sid.h index 52cd8d9b92f..8770f031cd9 100644 --- a/sys/dev/pci/drm/radeon/sid.h +++ b/sys/dev/pci/drm/radeon/sid.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sid.h,v 1.3 2014/01/24 04:57:35 jsg Exp $ */ +/* $OpenBSD: sid.h,v 1.4 2014/02/10 01:05:07 jsg Exp $ */ /* * Copyright 2011 Advanced Micro Devices, Inc. * @@ -882,7 +882,7 @@ * 6. COMMAND [30:21] | BYTE_COUNT [20:0] */ # define PACKET3_CP_DMA_DST_SEL(x) ((x) << 20) - /* 0 - SRC_ADDR + /* 0 - DST_ADDR * 1 - GDS */ # define PACKET3_CP_DMA_ENGINE(x) ((x) << 27) @@ -897,7 +897,7 @@ # define PACKET3_CP_DMA_CP_SYNC (1 << 31) /* COMMAND */ # define PACKET3_CP_DMA_DIS_WC (1 << 21) -# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23) +# define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 22) /* 0 - none * 1 - 8 in 16 * 2 - 8 in 32 |