diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/gpu/drm/radeon/r100d.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/gpu/drm/radeon/r100d.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100d.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r100d.h b/drivers/gpu/drm/radeon/r100d.h index b121b6c678d4..eab91760fae0 100644 --- a/drivers/gpu/drm/radeon/r100d.h +++ b/drivers/gpu/drm/radeon/r100d.h | |||
| @@ -551,7 +551,7 @@ | |||
| 551 | #define S_000360_CUR2_LOCK(x) (((x) & 0x1) << 31) | 551 | #define S_000360_CUR2_LOCK(x) (((x) & 0x1) << 31) |
| 552 | #define G_000360_CUR2_LOCK(x) (((x) >> 31) & 0x1) | 552 | #define G_000360_CUR2_LOCK(x) (((x) >> 31) & 0x1) |
| 553 | #define C_000360_CUR2_LOCK 0x7FFFFFFF | 553 | #define C_000360_CUR2_LOCK 0x7FFFFFFF |
| 554 | #define R_0003C2_GENMO_WT 0x0003C0 | 554 | #define R_0003C2_GENMO_WT 0x0003C2 |
| 555 | #define S_0003C2_GENMO_MONO_ADDRESS_B(x) (((x) & 0x1) << 0) | 555 | #define S_0003C2_GENMO_MONO_ADDRESS_B(x) (((x) & 0x1) << 0) |
| 556 | #define G_0003C2_GENMO_MONO_ADDRESS_B(x) (((x) >> 0) & 0x1) | 556 | #define G_0003C2_GENMO_MONO_ADDRESS_B(x) (((x) >> 0) & 0x1) |
| 557 | #define C_0003C2_GENMO_MONO_ADDRESS_B 0xFE | 557 | #define C_0003C2_GENMO_MONO_ADDRESS_B 0xFE |