Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
radeon
/
ni.c
diff --git
a/kernel/drivers/gpu/drm/radeon/ni.c
b/kernel/drivers/gpu/drm/radeon/ni.c
index
158872e
..
a3a3212
100644
(file)
--- a/
kernel/drivers/gpu/drm/radeon/ni.c
+++ b/
kernel/drivers/gpu/drm/radeon/ni.c
@@
-1396,9
+1396,7
@@
static void cayman_pcie_gart_fini(struct radeon_device *rdev)
void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
int ring, u32 cp_int_cntl)
{
void cayman_cp_int_cntl_setup(struct radeon_device *rdev,
int ring, u32 cp_int_cntl)
{
- u32 srbm_gfx_cntl = RREG32(SRBM_GFX_CNTL) & ~3;
-
- WREG32(SRBM_GFX_CNTL, srbm_gfx_cntl | (ring & 3));
+ WREG32(SRBM_GFX_CNTL, RINGID(ring));
WREG32(CP_INT_CNTL, cp_int_cntl);
}
WREG32(CP_INT_CNTL, cp_int_cntl);
}