diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 12:57:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 12:57:56 -0400 |
| commit | 8ed54bd5657b75e654c5913bcc5c680485a531b6 (patch) | |
| tree | 789f66b0af61b1625420705b49d4cc00ef336b83 /drivers/gpu | |
| parent | 25b210371f76ac63b30d998549f5f4891d805f3b (diff) | |
| parent | 194b3da873fd334ef183806db751473512af29ce (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
agp: fix arbitrary kernel memory writes
agp: fix OOM and buffer overflow
drm/radeon/kms: fix IH writeback on r6xx+ on big endian machines
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 43fd01674489..e9bc135d9189 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
| @@ -2580,7 +2580,7 @@ static inline u32 evergreen_get_ih_wptr(struct radeon_device *rdev) | |||
| 2580 | u32 wptr, tmp; | 2580 | u32 wptr, tmp; |
| 2581 | 2581 | ||
| 2582 | if (rdev->wb.enabled) | 2582 | if (rdev->wb.enabled) |
| 2583 | wptr = rdev->wb.wb[R600_WB_IH_WPTR_OFFSET/4]; | 2583 | wptr = le32_to_cpu(rdev->wb.wb[R600_WB_IH_WPTR_OFFSET/4]); |
| 2584 | else | 2584 | else |
| 2585 | wptr = RREG32(IH_RB_WPTR); | 2585 | wptr = RREG32(IH_RB_WPTR); |
| 2586 | 2586 | ||
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 15d58292677a..6f27593901c7 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
| @@ -3231,7 +3231,7 @@ static inline u32 r600_get_ih_wptr(struct radeon_device *rdev) | |||
| 3231 | u32 wptr, tmp; | 3231 | u32 wptr, tmp; |
| 3232 | 3232 | ||
| 3233 | if (rdev->wb.enabled) | 3233 | if (rdev->wb.enabled) |
| 3234 | wptr = rdev->wb.wb[R600_WB_IH_WPTR_OFFSET/4]; | 3234 | wptr = le32_to_cpu(rdev->wb.wb[R600_WB_IH_WPTR_OFFSET/4]); |
| 3235 | else | 3235 | else |
| 3236 | wptr = RREG32(IH_RB_WPTR); | 3236 | wptr = RREG32(IH_RB_WPTR); |
| 3237 | 3237 | ||