fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 23:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g, radeong: fix the CS overflow

Browse source
This commit is contained in:
Marek Olšák 2009-12-02 17:15:27 +01:00 • committed by Corbin Simpson
parent 3da8265cd3
commit 7679447b58
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/r300/r300_cs.h
View file

@ -55,7 +55,7 @@
int cs_count = 0;
#define CHECK_CS(size) \
cs_winsys->check_cs(cs_winsys, (size))
assert(cs_winsys->check_cs(cs_winsys, (size)))
#define BEGIN_CS(size) do { \
CHECK_CS(size); \

9
src/gallium/drivers/r300/r300_emit.c
View file

@ -871,10 +871,17 @@ void r300_emit_dirty_state(struct r300_context* r300)
return;
}
/* Check size of CS. */
/* Make sure we have at least 8*1024 spare dwords. */
/* XXX It would be nice to know the number of dwords we really need to
* XXX emit. */
if (!r300->winsys->check_cs(r300->winsys, 8*1024)) {
r300->context.flush(&r300->context, 0, NULL);
}
/* Clean out BOs. */
r300->winsys->reset_bos(r300->winsys);
/* XXX check size */
validate:
/* Color buffers... */
for (i = 0; i < r300->framebuffer_state.nr_cbufs; i++) {

5
src/gallium/winsys/drm/radeon/core/radeon_r300.c
View file

@ -52,8 +52,9 @@ static boolean radeon_validate(struct radeon_winsys* winsys)
static boolean radeon_check_cs(struct radeon_winsys* winsys, int size)
{
/* XXX check size here, lazy ass! */
return radeon_validate(winsys);
struct radeon_cs* cs = winsys->priv->cs;
return radeon_validate(winsys) && cs->cdw + size <= cs->ndw;
}
static void radeon_begin_cs(struct radeon_winsys* winsys,