Skip to content

L
linux-davinci
Commit 797fd5b9 authored by Marek Olšák's avatar Marek Olšák Committed by Dave Airlie
Browse files
Options

drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill 

Signed-off-by: default avatarMarek Olšák <maraeo@gmail.com>
parent 88b04507
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
drivers/gpu/drm/radeon/r100.c
View file @ 797fd5b9
...@@ -2974,7 +2974,7 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) ...@@ -2974,7 +2974,7 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track)
for (i = 0; i < track->num_cb; i++) { for (i = 0; i < track->num_cb; i++) {
if (track->cb[i].robj == NULL) { if (track->cb[i].robj == NULL) {
if (!(track->fastfill || track->color_channel_mask || if (!(track->zb_cb_clear || track->color_channel_mask ||
track->blend_read_enable)) { track->blend_read_enable)) {
continue; continue;
} }
......
drivers/gpu/drm/radeon/r100_track.h
View file @ 797fd5b9
...@@ -75,7 +75,7 @@ struct r100_cs_track { ...@@ -75,7 +75,7 @@ struct r100_cs_track {
struct r100_cs_track_texture textures[R300_TRACK_MAX_TEXTURE]; struct r100_cs_track_texture textures[R300_TRACK_MAX_TEXTURE];
bool z_enabled; bool z_enabled;
bool separate_cube; bool separate_cube;
bool fastfill; bool zb_cb_clear;
bool blend_read_enable; bool blend_read_enable;
}; };
......
drivers/gpu/drm/radeon/r300.c
View file @ 797fd5b9
...@@ -1043,7 +1043,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p, ...@@ -1043,7 +1043,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
break; break;
case 0x4d1c: case 0x4d1c:
/* ZB_BW_CNTL */ /* ZB_BW_CNTL */
track->fastfill = !!(idx_value & (1 << 2)); track->zb_cb_clear = !!(idx_value & (1 << 5));
break; break;
case 0x4e04: case 0x4e04:
/* RB3D_BLENDCNTL */ /* RB3D_BLENDCNTL */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment