fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radeon: further cleanup dri1 screen init

Browse source
This commit is contained in:
Dave Airlie 2009-04-28 15:35:52 +10:00
parent 7731d93165
commit a9d64873d7
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/drivers/dri/radeon/radeon_screen.c
View file

@ -904,7 +904,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
ret = radeonGetParam(sPriv, RADEON_PARAM_FB_LOCATION, &temp);
if (ret) {
if (screen->chip_family < CHIP_FAMILY_RS600 && !screen->kernel_mm)
if (screen->chip_family < CHIP_FAMILY_RS600)
screen->fbLocation = ( INREG( RADEON_MC_FB_LOCATION ) & 0xffff) << 16;
else {
FREE( screen );
@ -1005,9 +1005,8 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
screen->extensions[i++] = &driMediaStreamCounterExtension.base;
}
if (!screen->kernel_mm) {
#if !RADEON_COMMON
screen->extensions[i++] = &radeonTexOffsetExtension.base;
screen->extensions[i++] = &radeonTexOffsetExtension.base;
#endif
#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R200)
@ -1030,10 +1029,7 @@ radeonCreateScreen( __DRIscreenPrivate *sPriv )
screen->sarea = (drm_radeon_sarea_t *) ((GLubyte *) sPriv->pSAREA +
screen->sarea_priv_offset);
if (screen->kernel_mm)
screen->bom = radeon_bo_manager_gem_ctor(sPriv->fd);
else
screen->bom = radeon_bo_manager_legacy_ctor(screen);
screen->bom = radeon_bo_manager_legacy_ctor(screen);
if (screen->bom == NULL) {
free(screen);
return NULL;