diff options
author | Marek Olšák <maraeo@gmail.com> | 2010-04-12 20:33:36 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-04-28 03:20:41 -0400 |
commit | 797fd5b9dad12a100c81b5782573a41259728cb1 (patch) | |
tree | d46a78d0af3ea8e99bd916c27748619d93bb054e /drivers/gpu | |
parent | 88b045077a1462a47503137fd4ca0c31772819ca (diff) |
drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/r100_track.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index c06207e4085c..e30257904048 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
@@ -2974,7 +2974,7 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) | |||
2974 | 2974 | ||
2975 | for (i = 0; i < track->num_cb; i++) { | 2975 | for (i = 0; i < track->num_cb; i++) { |
2976 | if (track->cb[i].robj == NULL) { | 2976 | if (track->cb[i].robj == NULL) { |
2977 | if (!(track->fastfill || track->color_channel_mask || | 2977 | if (!(track->zb_cb_clear || track->color_channel_mask || |
2978 | track->blend_read_enable)) { | 2978 | track->blend_read_enable)) { |
2979 | continue; | 2979 | continue; |
2980 | } | 2980 | } |
diff --git a/drivers/gpu/drm/radeon/r100_track.h b/drivers/gpu/drm/radeon/r100_track.h index fadfe68de9cc..f47cdca1c004 100644 --- a/drivers/gpu/drm/radeon/r100_track.h +++ b/drivers/gpu/drm/radeon/r100_track.h | |||
@@ -75,7 +75,7 @@ struct r100_cs_track { | |||
75 | struct r100_cs_track_texture textures[R300_TRACK_MAX_TEXTURE]; | 75 | struct r100_cs_track_texture textures[R300_TRACK_MAX_TEXTURE]; |
76 | bool z_enabled; | 76 | bool z_enabled; |
77 | bool separate_cube; | 77 | bool separate_cube; |
78 | bool fastfill; | 78 | bool zb_cb_clear; |
79 | bool blend_read_enable; | 79 | bool blend_read_enable; |
80 | }; | 80 | }; |
81 | 81 | ||
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 6ec86fc2f474..ad0a0e6647c2 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
@@ -1043,7 +1043,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, | |||
1043 | break; | 1043 | break; |
1044 | case 0x4d1c: | 1044 | case 0x4d1c: |
1045 | /* ZB_BW_CNTL */ | 1045 | /* ZB_BW_CNTL */ |
1046 | track->fastfill = !!(idx_value & (1 << 2)); | 1046 | track->zb_cb_clear = !!(idx_value & (1 << 5)); |
1047 | break; | 1047 | break; |
1048 | case 0x4e04: | 1048 | case 0x4e04: |
1049 | /* RB3D_BLENDCNTL */ | 1049 | /* RB3D_BLENDCNTL */ |