diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-09 08:13:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-09 08:13:01 +0100 |
| commit | 355a73f07d1da405728c9e57afd6eede340788f4 (patch) | |
| tree | bca9d993a19c9cf0940231323ad74fbec605b044 /drivers/gpu/drm/radeon/cikd.h | |
| parent | staging: fsl-mc: fsl-mc object allocator driver (diff) | |
| parent | Linux 4.0-rc3 (diff) | |
| download | linux-355a73f07d1da405728c9e57afd6eede340788f4.tar.xz linux-355a73f07d1da405728c9e57afd6eede340788f4.zip | |
Merge 4.0-rc3 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/radeon/cikd.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/cikd.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/cikd.h b/drivers/gpu/drm/radeon/cikd.h index 03003f8a6de6..c648e1996dab 100644 --- a/drivers/gpu/drm/radeon/cikd.h +++ b/drivers/gpu/drm/radeon/cikd.h @@ -482,6 +482,10 @@ #define SOFT_RESET_ORB (1 << 23) #define SOFT_RESET_VCE (1 << 24) +#define SRBM_READ_ERROR 0xE98 +#define SRBM_INT_CNTL 0xEA0 +#define SRBM_INT_ACK 0xEA8 + #define VM_L2_CNTL 0x1400 #define ENABLE_L2_CACHE (1 << 0) #define ENABLE_L2_FRAGMENT_PROCESSING (1 << 1) |