diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-23 11:18:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-23 11:18:33 +1000 |
| commit | d94a5108f716bbd524358eb5a440d63991744a62 (patch) | |
| tree | 221988e3e87c26bf0cdf16cc411b3e3220c8637e /drivers/gpu/drm/radeon/r100_track.h | |
| parent | 44f9e6c6bc508b202755d9e9e48a8ba96a5f0fa4 (diff) | |
| parent | 0786201d8cd0730e72b0e087484dd47cc5f58409 (diff) | |
| download | op-kernel-dev-d94a5108f716bbd524358eb5a440d63991744a62.zip op-kernel-dev-d94a5108f716bbd524358eb5a440d63991744a62.tar.gz | |
Merge remote branch 'korg/drm-radeon-next' into drm-linus
* korg/drm-radeon-next:
drm/radeon/kms: add definitions for v4 power tables
drm/radeon/kms: never combine LVDS with another encoder
drm/radeon/kms: Check module arguments to be valid V2
drm/radeon/kms: Avoid crash when trying to cleanup uninitialized structure
drm/radeon/kms: add cvt mode if we only have lvds w/h and no edid (v4)
drm/radeon/kms: add 3DC compression support
drm/radeon/kms: allow rendering while no colorbuffer is set on r300
drm/radeon/kms: enable memory clock reading on legacy (V2)
drm/radeon/kms: prevent parallel AtomBIOS calls
drm/radeon/kms: set proper default tv standard
drm/radeon/kms: fix legacy rmx
drm/radeon/kms/atom: fill in proper defines for digital setup
Diffstat (limited to 'drivers/gpu/drm/radeon/r100_track.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100_track.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h index 7188c37..b27a699 100644 --- a/drivers/gpu/drm/radeon/r100_track.h +++ b/drivers/gpu/drm/radeon/r100_track.h @@ -67,13 +67,15 @@ struct r100_cs_track { unsigned immd_dwords; unsigned num_arrays; unsigned max_indx; + unsigned color_channel_mask; struct r100_cs_track_array arrays[11]; struct r100_cs_track_cb cb[R300_MAX_CB]; struct r100_cs_track_cb zb; struct r100_cs_track_texture textures[R300_TRACK_MAX_TEXTURE]; bool z_enabled; bool separate_cube; - + bool fastfill; + bool blend_read_enable; }; int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track); |
