Skip to content

Commit

Permalink
drm/radeon/kms/r600: fix blit dword count for non r6xx
Browse files Browse the repository at this point in the history
rv6xx emits two extra dwords in the render target setup.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
  • Loading branch information
Alex Deucher authored and Dave Airlie committed Sep 11, 2009
1 parent 7747b71 commit 1be3405
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/gpu/drm/radeon/r600_blit_kms.c
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,12 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
int r;
int ring_size;
int max_size;
/* loops of emits 64 + fence emit possible */
int dwords_per_loop = 76;

/* set_render_target emits 2 extra dwords on rv6xx */
if (rdev->family > CHIP_R600 && rdev->family < CHIP_RV770)
dwords_per_loop += 2;

/* 8 bpp vs 32 bpp for xfer unit */
if (size_bytes & 3)
Expand All @@ -560,8 +566,7 @@ int r600_blit_prepare_copy(struct radeon_device *rdev, int size_bytes)
r = r600_vb_ib_get(rdev);
WARN_ON(r);

/* loops of emits 64 + fence emit possible */
ring_size = ((size_bytes + max_size) / max_size) * 78;
ring_size = ((size_bytes + max_size) / max_size) * dwords_per_loop;
/* set default + shaders */
ring_size += 40; /* shaders + def state */
ring_size += 3; /* fence emit for VB IB */
Expand Down

0 comments on commit 1be3405

Please sign in to comment.