diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
| commit | 9cb5baba5e3acba0994ad899ee908799104c9965 (patch) | |
| tree | d5ff16000256a0bf56279926e6114b4603ede2b4 /drivers/gpu/drm/radeon/atom.c | |
| parent | 7142d17e8f935fa842e9f6eece2281b6d41625d6 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into sched/core
Diffstat (limited to 'drivers/gpu/drm/radeon/atom.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/atom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index d71d375149f8..7bd745689097 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c | |||
| @@ -135,7 +135,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, | |||
| 135 | case ATOM_IIO_MOVE_INDEX: | 135 | case ATOM_IIO_MOVE_INDEX: |
| 136 | temp &= | 136 | temp &= |
| 137 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << | 137 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << |
| 138 | CU8(base + 2)); | 138 | CU8(base + 3)); |
| 139 | temp |= | 139 | temp |= |
| 140 | ((index >> CU8(base + 2)) & | 140 | ((index >> CU8(base + 2)) & |
| 141 | (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + | 141 | (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + |
| @@ -145,7 +145,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, | |||
| 145 | case ATOM_IIO_MOVE_DATA: | 145 | case ATOM_IIO_MOVE_DATA: |
| 146 | temp &= | 146 | temp &= |
| 147 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << | 147 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << |
| 148 | CU8(base + 2)); | 148 | CU8(base + 3)); |
| 149 | temp |= | 149 | temp |= |
| 150 | ((data >> CU8(base + 2)) & | 150 | ((data >> CU8(base + 2)) & |
| 151 | (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + | 151 | (0xFFFFFFFF >> (32 - CU8(base + 1)))) << CU8(base + |
| @@ -155,7 +155,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base, | |||
| 155 | case ATOM_IIO_MOVE_ATTR: | 155 | case ATOM_IIO_MOVE_ATTR: |
| 156 | temp &= | 156 | temp &= |
| 157 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << | 157 | ~((0xFFFFFFFF >> (32 - CU8(base + 1))) << |
| 158 | CU8(base + 2)); | 158 | CU8(base + 3)); |
| 159 | temp |= | 159 | temp |= |
| 160 | ((ctx-> | 160 | ((ctx-> |
| 161 | io_attr >> CU8(base + 2)) & (0xFFFFFFFF >> (32 - | 161 | io_attr >> CU8(base + 2)) & (0xFFFFFFFF >> (32 - |