git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'origin/master' into drm-intel-next
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
r100.c
diff --git
a/drivers/gpu/drm/radeon/r100.c
b/drivers/gpu/drm/radeon/r100.c
index
9bdccb9
..
4de41b0
100644
(file)
--- a/
drivers/gpu/drm/radeon/r100.c
+++ b/
drivers/gpu/drm/radeon/r100.c
@@
-3004,7
+3004,7
@@
int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track)
for (i = 0; i < track->num_cb; i++) {
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)) {
continue;
}