From 8a9cd986392b02198e9cb1bcd1162a8d870a9567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 12 Sep 2010 05:09:13 +0200 Subject: [PATCH] --- yaml --- r: 210707 b: refs/heads/master c: a41ceb1c17af06a17c0d88e987215ef20b93c471 h: refs/heads/master i: 210705: d16f484c04cc5714cb6742cebec2f100192f32fd 210703: d16a8e5647c963de34b1edd0f74a0730a92bf316 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r100.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a9e64c2a13bd..b60971471c12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec00efb72f4b88078427d01f38f664c67c7ca0c0 +refs/heads/master: a41ceb1c17af06a17c0d88e987215ef20b93c471 diff --git a/trunk/drivers/gpu/drm/radeon/r100.c b/trunk/drivers/gpu/drm/radeon/r100.c index ec64b365ee1f..e151f16a8f86 100644 --- a/trunk/drivers/gpu/drm/radeon/r100.c +++ b/trunk/drivers/gpu/drm/radeon/r100.c @@ -3297,13 +3297,14 @@ int r100_cs_track_check(struct radeon_device *rdev, struct r100_cs_track *track) unsigned long size; unsigned prim_walk; unsigned nverts; + unsigned num_cb = track->num_cb; - for (i = 0; i < track->num_cb; i++) { + if (!track->zb_cb_clear && !track->color_channel_mask && + !track->blend_read_enable) + num_cb = 0; + + for (i = 0; i < num_cb; i++) { if (track->cb[i].robj == NULL) { - if (!(track->zb_cb_clear || track->color_channel_mask || - track->blend_read_enable)) { - continue; - } DRM_ERROR("[drm] No buffer for color buffer %d !\n", i); return -EINVAL; }