Mesa (radeon-rewrite): radeon: further cleanup dri1 screen init
Dave Airlie
airlied at kemper.freedesktop.org
Tue Apr 28 05:40:26 UTC 2009
Module: Mesa
Branch: radeon-rewrite
Commit: a9d64873d771a0ac8a319f036d97d827fea934df
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9d64873d771a0ac8a319f036d97d827fea934df
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Apr 28 15:35:52 2009 +1000
radeon: further cleanup dri1 screen init
---
src/mesa/drivers/dri/radeon/radeon_screen.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index ed542d7..544ab74 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -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;
More information about the mesa-commit
mailing list