diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-07-02 08:31:48 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-07-02 08:31:48 +0200 |
| commit | 5f0e5afa0de4522abb3ea7d1369039b94e740ec5 (patch) | |
| tree | 6a5be3db9ecfed8ef2150c6146f6d1e0d658ac8b /drivers/gpu/drm/radeon/sid.h | |
| parent | drbd: Allow online change of al-stripes and al-stripe-size (diff) | |
| parent | Linux 3.10-rc7 (diff) | |
| download | linux-5f0e5afa0de4522abb3ea7d1369039b94e740ec5.tar.xz linux-5f0e5afa0de4522abb3ea7d1369039b94e740ec5.zip | |
Merge tag 'v3.10-rc7' into for-3.11/drivers
Linux 3.10-rc7
Pull this in early to avoid doing it with the bcache merge,
since there are a number of changes to bcache between my old
base (3.10-rc1) and the new pull request.
Diffstat (limited to 'drivers/gpu/drm/radeon/sid.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/sid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h index 222877ba6cf5..8f2d7d4f9b28 100644 --- a/drivers/gpu/drm/radeon/sid.h +++ b/drivers/gpu/drm/radeon/sid.h @@ -28,6 +28,7 @@ #define TAHITI_GB_ADDR_CONFIG_GOLDEN 0x12011003 #define VERDE_GB_ADDR_CONFIG_GOLDEN 0x12010002 +#define HAINAN_GB_ADDR_CONFIG_GOLDEN 0x02010001 /* discrete uvd clocks */ #define CG_UPLL_FUNC_CNTL 0x634 |