diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-02 20:08:56 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-02 20:08:56 +0400 |
| commit | 6e139047e2eecd0ccf8bc2f1564e82747cb6e56c (patch) | |
| tree | 7a6da9101cb04b918a3c76bfe21abbd2bdeb4d99 /drivers/gpu/drm/radeon/nid.h | |
| parent | c66a86d0cdce3bad2da794f114cc37377d242c3d (diff) | |
| parent | 6002525170df5f72c92ab946b6ebf1656aaec74d (diff) | |
| download | linux-6e139047e2eecd0ccf8bc2f1564e82747cb6e56c.tar.xz | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
Revert "drm/nvc0: recognise 0xdX chipsets as NV_C0"
drm/radeon/kms: fix typo in cayman reg offset
drm/radeon/kms: use correct reg on fusion when reading back mem config
Diffstat (limited to 'drivers/gpu/drm/radeon/nid.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/nid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/nid.h b/drivers/gpu/drm/radeon/nid.h index 9736746da2d6..4672869cdb26 100644 --- a/drivers/gpu/drm/radeon/nid.h +++ b/drivers/gpu/drm/radeon/nid.h @@ -320,7 +320,7 @@ #define CGTS_USER_TCC_DISABLE 0x914C #define TCC_DISABLE_MASK 0xFFFF0000 #define TCC_DISABLE_SHIFT 16 -#define CGTS_SM_CTRL_REG 0x915C +#define CGTS_SM_CTRL_REG 0x9150 #define OVERRIDE (1 << 21) #define TA_CNTL_AUX 0x9508 |