KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix buffer age implementaion bug.

This commit is contained in:
Richard Li 2009-07-08 14:49:48 -04:00
parent f9db04878b
commit 93ab69a0ef
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/mesa/drivers/dri/r600/r600_cmdbuf.c
View File

@ -378,7 +378,36 @@ static int r600_cs_emit(struct radeon_cs *cs)
/* TODO : put chip level things here if need. */
/* csm->ctx->vtbl.emit_cs_header(cs, csm->ctx); */
/* TODO : append buffer age */
BATCH_LOCALS(csm->ctx);
drm_radeon_getparam_t gp;
uint32_t current_scratchx_age;
gp.param = RADEON_PARAM_LAST_CLEAR;
gp.value = (int *)&current_scratchx_age;
r = drmCommandWriteRead(cs->csm->fd,
DRM_RADEON_GETPARAM,
&gp,
sizeof(gp));
if (r)
{
fprintf(stderr, "%s: drmRadeonGetParam: %d\n", __FUNCTION__, r);
exit(1);
}
csm->pending_age = 0;
csm->pending_count = 1;
current_scratchx_age++;
csm->pending_age = current_scratchx_age;
BEGIN_BATCH_NO_AUTOSTATE(2);
R600_OUT_BATCH(0x2142); /* scratch 2 */
R600_OUT_BATCH(current_scratchx_age);
END_BATCH();
COMMIT_BATCH();
//TODO ioctl to get back cs id assigned in drm
//csm->pending_age = cs_id_back;
r = r600_cs_process_relocs(cs, &(reloc_chunk[0]), &length_dw_reloc_chunk);
if (r) {

7
src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
View File

@ -171,7 +171,9 @@ static void legacy_get_current_age(struct bo_manager_legacy *boml)
unsigned char *RADEONMMIO = NULL;
int r;
if (IS_R300_CLASS(boml->screen)) {
if ( IS_R300_CLASS(boml->screen)
|| IS_R600_CLASS(boml->screen) )
{
gp.param = RADEON_PARAM_LAST_CLEAR;
gp.value = (int *)&boml->current_age;
r = drmCommandWriteRead(boml->base.fd, DRM_RADEON_GETPARAM,
@ -180,7 +182,8 @@ static void legacy_get_current_age(struct bo_manager_legacy *boml)
fprintf(stderr, "%s: drmRadeonGetParam: %d\n", __FUNCTION__, r);
exit(1);
}
} else {
}
else {
RADEONMMIO = boml->screen->mmio.map;
boml->current_age = boml->screen->scratch[3];
boml->current_age = INREG(RADEON_GUI_SCRATCH_REG3);