diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-13 22:33:29 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-13 22:33:29 +0400 |
| commit | b240add62c7c0e15bfaba59fa37bd44480e31681 (patch) | |
| tree | 16005042c70e0dfbe885bb8b5553d3a36c7bf61d /drivers/gpu/drm/radeon/si.c | |
| parent | 51f1206f607878716cbeaf8da4efa9399ed16e54 (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | linux-b240add62c7c0e15bfaba59fa37bd44480e31681.tar.xz | |
Merge 3.7-rc5 into usb-next
This pulls in the 3.7-rc5 branch into usb-next
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 b0db712060fb..4422d630b33b 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -2474,6 +2474,7 @@ static bool si_vm_reg_valid(u32 reg) /* check config regs */ switch (reg) { case GRBM_GFX_INDEX: + case CP_STRMOUT_CNTL: case VGT_VTX_VECT_EJECT_REG: case VGT_CACHE_INVALIDATION: case VGT_ESGS_RING_SIZE: |