diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-14 12:15:57 +0000 |
| commit | 6a7fe00e1f5a2e77b777b6e3b90c924c95bfa866 (patch) | |
| tree | 1446c710e4a76d79fe11b1fa01ccb508f0d12d67 /drivers/gpu/drm/radeon/evergreen_cs.c | |
| parent | ccf1801b089f5575144c4346e4d7d3883a6c9163 (diff) | |
| parent | 8415e604452966f981f20cb4d8a8a30e38a772dd (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlinux-linaro-lsk-v3.10-androidlinux-linaro-lsk-android
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_cs.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen_cs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index eb8ac315f92..c7cac07f139 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -967,7 +967,10 @@ static int evergreen_cs_track_check(struct radeon_cs_parser *p) if (track->cb_dirty) { tmp = track->cb_target_mask; for (i = 0; i < 8; i++) { - if ((tmp >> (i * 4)) & 0xF) { + u32 format = G_028C70_FORMAT(track->cb_color_info[i]); + + if (format != V_028C70_COLOR_INVALID && + (tmp >> (i * 4)) & 0xF) { /* at least one component is enabled */ if (track->cb_color_bo[i] == NULL) { dev_warn(p->dev, "%s:%d mask 0x%08X | 0x%08X no cb for %d\n", |