diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 20:37:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 20:37:06 -0700 |
| commit | b83db1deb29eb4eea9bf5992431d26978e039ce6 (patch) | |
| tree | a59a4d94c41de6889be93b6963c791aa64181f25 /drivers/gpu/drm/radeon/r100_track.h | |
| parent | 7d2f280e75f05919314e250cadf361a327ed555c (diff) | |
| parent | 7e94250312d8b32a18e7e96cee19f2795d224e8c (diff) | |
| download | op-kernel-dev-b83db1deb29eb4eea9bf5992431d26978e039ce6.zip op-kernel-dev-b83db1deb29eb4eea9bf5992431d26978e039ce6.tar.gz | |
Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: enable unmappable vram for evergreen
drm/radeon/kms: fix tiled db height calculation on 6xx/7xx
drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx
Diffstat (limited to 'drivers/gpu/drm/radeon/r100_track.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100_track.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h index f47cdca..af65600 100644 --- a/drivers/gpu/drm/radeon/r100_track.h +++ b/drivers/gpu/drm/radeon/r100_track.h @@ -46,6 +46,7 @@ struct r100_cs_track_texture { unsigned height_11; bool use_pitch; bool enabled; + bool lookup_disable; bool roundup_w; bool roundup_h; unsigned compress_format; |
