diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:49:23 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:49:23 -0500 |
| commit | 5e819059a20b0fc5a71875f28b4cae359e38d85a (patch) | |
| tree | b94a18142abc5e60c84f90ee2490e8a6af01c2a9 /drivers/gpu | |
| parent | ae2772b313b98a14f69b5bc67135c9fee48771be (diff) | |
| parent | cc438fccd5783c9f7b4c4858358ac897dcf8a58d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_fence.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 7fd4e3e5ad5f..3475a09f946b 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c | |||
| @@ -48,7 +48,7 @@ static void radeon_fence_write(struct radeon_device *rdev, u32 seq) | |||
| 48 | scratch_index = R600_WB_EVENT_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; | 48 | scratch_index = R600_WB_EVENT_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; |
| 49 | else | 49 | else |
| 50 | scratch_index = RADEON_WB_SCRATCH_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; | 50 | scratch_index = RADEON_WB_SCRATCH_OFFSET + rdev->fence_drv.scratch_reg - rdev->scratch.reg_base; |
| 51 | rdev->wb.wb[scratch_index/4] = cpu_to_le32(seq);; | 51 | rdev->wb.wb[scratch_index/4] = cpu_to_le32(seq); |
| 52 | } else | 52 | } else |
| 53 | WREG32(rdev->fence_drv.scratch_reg, seq); | 53 | WREG32(rdev->fence_drv.scratch_reg, seq); |
| 54 | } | 54 | } |