Commit 7e9fa5f6 authored by Marek Olšák's avatar Marek Olšák Committed by Dave Airlie

drm/radeon/kms: optimize streamout checking for evergreen

Signed-off-by: default avatarMarek Olšák <maraeo@gmail.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 78857131
...@@ -797,31 +797,36 @@ static int evergreen_cs_track_validate_texture(struct radeon_cs_parser *p, ...@@ -797,31 +797,36 @@ static int evergreen_cs_track_validate_texture(struct radeon_cs_parser *p,
static int evergreen_cs_track_check(struct radeon_cs_parser *p) static int evergreen_cs_track_check(struct radeon_cs_parser *p)
{ {
struct evergreen_cs_track *track = p->track; struct evergreen_cs_track *track = p->track;
unsigned tmp, i, j; unsigned tmp, i;
int r; int r;
unsigned buffer_mask = 0;
/* check streamout */ /* check streamout */
if (track->vgt_strmout_config) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (track->vgt_strmout_config & (1 << i)) { if (track->vgt_strmout_config & (1 << i)) {
for (j = 0; j < 4; j++) { buffer_mask |= (track->vgt_strmout_buffer_config >> (i * 4)) & 0xf;
if ((track->vgt_strmout_buffer_config >> (i * 4)) & (1 << j)) { }
if (track->vgt_strmout_bo[j]) { }
u64 offset = (u64)track->vgt_strmout_bo_offset[j] +
(u64)track->vgt_strmout_size[j]; for (i = 0; i < 4; i++) {
if (buffer_mask & (1 << i)) {
if (track->vgt_strmout_bo[i]) {
u64 offset = (u64)track->vgt_strmout_bo_offset[i] +
(u64)track->vgt_strmout_size[i];
if (offset > radeon_bo_size(track->vgt_strmout_bo[i])) { if (offset > radeon_bo_size(track->vgt_strmout_bo[i])) {
DRM_ERROR("streamout %d bo too small: 0x%llx, 0x%lx\n", DRM_ERROR("streamout %d bo too small: 0x%llx, 0x%lx\n",
j, offset, i, offset,
radeon_bo_size(track->vgt_strmout_bo[j])); radeon_bo_size(track->vgt_strmout_bo[i]));
return -EINVAL; return -EINVAL;
} }
} else { } else {
dev_warn(p->dev, "No buffer for streamout %d\n", j); dev_warn(p->dev, "No buffer for streamout %d\n", i);
return -EINVAL; return -EINVAL;
} }
} }
} }
} }
}
if (track->sx_misc_kill_all_prims) if (track->sx_misc_kill_all_prims)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment