2 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index eb8ac315f92f..c7cac07f139b 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",
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index d824f7fed47d..7b399dc5fd54 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -749,7 +749,10 @@ static int r600_cs_track_check(struct radeon_cs_parser *p)
                 }
 
                 for (i = 0; i < 8; i++) {
-                        if ((tmp >> (i * 4)) & 0xF) {
+                        u32 format = G_0280A0_FORMAT(track->cb_color_info[i]);
+
+                        if (format != V_0280A0_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",