diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-07-25 03:17:08 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-07-25 03:17:08 +0400 |
| commit | 97cefc3e94a863c1bd21f04387976b2840bd951e (patch) | |
| tree | dd9c701bd7750e18bf2e75c2c6036633c6999c88 /drivers/gpu/drm/radeon/si.c | |
| parent | 9d6ed3c695ddf66f7ff89565d843d95c420046d0 (diff) | |
| parent | e8c214d22e76dd0ead38f97f8d2dc09aac70d651 (diff) | |
| download | linux-97cefc3e94a863c1bd21f04387976b2840bd951e.tar.xz | |
Merge branch 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
two more radeon fixes.
* 'drm-fixes-3.16' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: fix irq ring buffer overflow handling
drm/radeon: fix error handling in radeon_vm_bo_set_addr
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/si.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index eba0225259a4..9e854fd016da 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -6103,6 +6103,7 @@ static inline u32 si_get_ih_wptr(struct radeon_device *rdev) tmp = RREG32(IH_RB_CNTL); tmp |= IH_WPTR_OVERFLOW_CLEAR; WREG32(IH_RB_CNTL, tmp); + wptr &= ~RB_OVERFLOW; } return (wptr & rdev->ih.ptr_mask); } |