diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 12:53:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 12:53:06 -0700 |
| commit | 516e77977085c9c50703fabb5dc61bd57a8cc1d0 (patch) | |
| tree | d26bb58aacd37da046f2e4c44dee3ff2b1616ef3 /drivers/gpu/drm/radeon/reg_srcs/r600 | |
| parent | 735e941caa9a35f933297af0ab1e0ad6447411c4 (diff) | |
| parent | d936622c36273a9ecfbb4aacf26cd29405995159 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"gma500 build fix + some regression fixes for nouveau/radeon"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: Only warn if the intra-domain offset actually exceeds the limit.
drm/radeon/kms: add htile support to the cs checker v3
drm/radeon/kms/atom: force bpc to 8 for now
drm/nouveau/i2c: fix thinko/regression on really old chipsets
drm/nouveau: default to 8bpc for non-LVDS panels if EDID isn't useful
drm/nouveau: fix thinko causing init to fail on cards without accel
gma500: medfield: fix build without CONFIG_BACKLIGHT_CLASS_DEVICE
Diffstat (limited to 'drivers/gpu/drm/radeon/reg_srcs/r600')
| -rw-r--r-- | drivers/gpu/drm/radeon/reg_srcs/r600 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r600 b/drivers/gpu/drm/radeon/reg_srcs/r600 index 626c24ea0b5..5e659b034d9 100644 --- a/drivers/gpu/drm/radeon/reg_srcs/r600 +++ b/drivers/gpu/drm/radeon/reg_srcs/r600 @@ -713,7 +713,6 @@ r600 0x9400 0x0000A710 TD_VS_SAMPLER17_BORDER_RED 0x00009508 TA_CNTL_AUX 0x0002802C DB_DEPTH_CLEAR -0x00028D24 DB_HTILE_SURFACE 0x00028D34 DB_PREFETCH_LIMIT 0x00028D30 DB_PRELOAD_CONTROL 0x00028D0C DB_RENDER_CONTROL |