fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 22:58:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Restore registers clobbered by radeonfb.o -- prevents slowdown to 200fps

Browse source 
of mesa demos.
This commit is contained in:
Keith Whitwell 2003-01-18 12:41:34 +00:00
parent 38bfead7d3
commit c3b1d1e63c
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/mesa/drivers/dri/radeon/server/radeon_dri.c
View file

@ -254,7 +254,6 @@ static int RADEONDRIAgpInit( struct MiniGLXDisplayRec *dpy, RADEONInfoPtr info)
/* Initialize the CP ring buffer data */
info->ringStart = info->agpOffset;
info->ringMapSize = info->ringSize*1024*1024 + DRM_PAGE_SIZE;
info->ringSizeLog2QW = RADEONMinBits(info->ringSize*1024*1024/8)-1;
info->ringReadOffset = info->ringStart + info->ringMapSize;
info->ringReadMapSize = DRM_PAGE_SIZE;
@ -891,22 +890,37 @@ static int __driInitScreenConfigs( struct MiniGLXDisplayRec *dpy,
static int __driValidateMode( struct MiniGLXDisplayRec *dpy )
{
#if 0
/* Work around radeonfb.o bug: virtual resolution must equal real
* resolution -- not necessary with our 'fixed' version of
* radeonfb.o...
unsigned char *RADEONMMIO = dpy->MMIOAddress;
RADEONInfoPtr info = dpy->driverInfo;
/* Save some regs here:
*/
dpy->VarInfo.xres = dpy->VarInfo.xres_virtual;
dpy->VarInfo.yres = dpy->VarInfo.yres_virtual;
#endif
info->gen_int_cntl = INREG(RADEON_GEN_INT_CNTL);
info->crtc_offset_cntl = INREG(RADEON_CRTC_OFFSET_CNTL);
fprintf(stderr, "saved: %x, %x\n",
info->gen_int_cntl,
info->crtc_offset_cntl);
return 1;
}
static int __driPostValidateMode( struct MiniGLXDisplayRec *dpy )
{
/* Need to restore registers here that fbdev has clobbered.
unsigned char *RADEONMMIO = dpy->MMIOAddress;
RADEONInfoPtr info = dpy->driverInfo;
fprintf(stderr, "modied: %x, %x\n",
INREG(RADEON_GEN_INT_CNTL),
INREG(RADEON_CRTC_OFFSET_CNTL));
/* Restore registers that fbdev has clobbered.
*/
OUTREG(RADEON_GEN_INT_CNTL, info->gen_int_cntl);
OUTREG(RADEON_CRTC_OFFSET_CNTL, info->crtc_offset_cntl);
return 1;
}