]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/radeon: initialize tracked CS state
authorMarek Olšák <maraeo@gmail.com>
Wed, 22 Aug 2012 15:02:43 +0000 (17:02 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 29 Aug 2012 16:11:00 +0000 (12:11 -0400)
This should help catch uninitialized registers and reject commands
because of that.

Signed-off-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/r600_cs.c

index 7799e283811f4d714dd636c50205f04d7c31c4be..8866937bd0b4510d86c116501634748bfb20f114 100644 (file)
@@ -315,7 +315,14 @@ static void r600_cs_track_init(struct r600_cs_track *track)
                track->cb_color_bo[i] = NULL;
                track->cb_color_bo_offset[i] = 0xFFFFFFFF;
                track->cb_color_bo_mc[i] = 0xFFFFFFFF;
-       }
+               track->cb_color_frag_bo[i] = NULL;
+               track->cb_color_frag_offset[i] = 0xFFFFFFFF;
+               track->cb_color_tile_bo[i] = NULL;
+               track->cb_color_tile_offset[i] = 0xFFFFFFFF;
+               track->cb_color_mask[i] = 0xFFFFFFFF;
+       }
+       track->nsamples = 16;
+       track->log_nsamples = 4;
        track->cb_target_mask = 0xFFFFFFFF;
        track->cb_shader_mask = 0xFFFFFFFF;
        track->cb_dirty = true;