From 85b4ae065435c8b4c4696b75e95f897130ee8bdf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Hellstr=C3=B6m?= Date: Mon, 10 Jul 2006 12:20:24 +0000 Subject: [PATCH] The SiS and Unichrome drivers assume that the handle to the AGP map is equivalent to the AGP physical address. Fix this. --- src/mesa/drivers/dri/sis/sis_context.c | 2 +- src/mesa/drivers/dri/sis/sis_dd.c | 2 +- src/mesa/drivers/dri/sis/sis_screen.c | 29 +++++++++++++++-- src/mesa/drivers/dri/sis/sis_screen.h | 1 + src/mesa/drivers/dri/unichrome/via_context.c | 2 +- src/mesa/drivers/dri/unichrome/via_screen.c | 34 ++++++++++++++------ 6 files changed, 55 insertions(+), 15 deletions(-) diff --git a/src/mesa/drivers/dri/sis/sis_context.c b/src/mesa/drivers/dri/sis/sis_context.c index 7e86c1127cb..a300a080ec0 100644 --- a/src/mesa/drivers/dri/sis/sis_context.c +++ b/src/mesa/drivers/dri/sis/sis_context.c @@ -272,7 +272,7 @@ sisCreateContext( const __GLcontextModes *glVisual, /* set AGP */ smesa->AGPSize = sisScreen->agp.size; smesa->AGPBase = sisScreen->agp.map; - smesa->AGPAddr = sisScreen->agp.handle; + smesa->AGPAddr = sisScreen->agpBaseOffset; /* Create AGP command buffer */ if (smesa->AGPSize != 0 && diff --git a/src/mesa/drivers/dri/sis/sis_dd.c b/src/mesa/drivers/dri/sis/sis_dd.c index 39c00a18af6..8fc7896b877 100644 --- a/src/mesa/drivers/dri/sis/sis_dd.c +++ b/src/mesa/drivers/dri/sis/sis_dd.c @@ -47,7 +47,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "utils.h" -#define DRIVER_DATE "20051023" +#define DRIVER_DATE "20060710" /* Return the width and height of the given buffer. */ diff --git a/src/mesa/drivers/dri/sis/sis_screen.c b/src/mesa/drivers/dri/sis/sis_screen.c index d4395a9cddf..a721a724ac4 100644 --- a/src/mesa/drivers/dri/sis/sis_screen.c +++ b/src/mesa/drivers/dri/sis/sis_screen.c @@ -163,6 +163,7 @@ sisCreateScreen( __DRIscreenPrivate *sPriv ) if (sisDRIPriv->agp.size) { sisScreen->agp.handle = sisDRIPriv->agp.handle; + sisScreen->agpBaseOffset = drmAgpBase(sPriv->fd); sisScreen->agp.size = sisDRIPriv->agp.size; if ( drmMap( sPriv->fd, sisScreen->agp.handle, sisScreen->agp.size, &sisScreen->agp.map ) ) @@ -349,15 +350,37 @@ void * __driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn, static const __DRIversion ddx_expected = {0, 8, 0}; static const __DRIversion dri_expected = {4, 0, 0}; static const __DRIversion drm_expected = {1, 0, 0}; - + static const __DRIversion drm_compat = {2, 0, 0}; + static const char *driver_name = "SiS"; dri_interface = interface; - if (!driCheckDriDdxDrmVersions2("SiS", dri_version, &dri_expected, + /* + * Check ddx and dri only. + */ + + if (!driCheckDriDdxDrmVersions2(driver_name, dri_version, &dri_expected, ddx_version, &ddx_expected, - drm_version, &drm_expected)) { + drm_version, drm_version)) { + return NULL; + } + + /* + * Check drm version with major versioning span. + */ + + if (((drm_version->major < drm_expected.major) || + (drm_version->major > drm_compat.major)) || + ((drm_version->major == drm_expected.major) && + (drm_version->minor < drm_expected.minor))) { + + fprintf(stderr, "%s DRI driver expected DRM version %d.%d.x - %d.x.x " + "but got version %d.%d.%d\n", driver_name, + drm_expected.major, drm_expected.minor, drm_compat.major, + drm_version->major, drm_version->minor, drm_version->patch); return NULL; } + psp = __driUtilCreateNewScreen(dpy, scrn, psc, NULL, ddx_version, dri_version, drm_version, frame_buffer, pSAREA, fd, diff --git a/src/mesa/drivers/dri/sis/sis_screen.h b/src/mesa/drivers/dri/sis/sis_screen.h index c3e9ef48764..d5b2101e980 100644 --- a/src/mesa/drivers/dri/sis/sis_screen.h +++ b/src/mesa/drivers/dri/sis/sis_screen.h @@ -41,6 +41,7 @@ typedef struct { typedef struct { sisRegionRec2 mmio; sisRegionRec2 agp; + unsigned long agpBaseOffset; unsigned int AGPCmdBufOffset; unsigned int AGPCmdBufSize; diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c index dabb233fc02..ffde1b66b76 100644 --- a/src/mesa/drivers/dri/unichrome/via_context.c +++ b/src/mesa/drivers/dri/unichrome/via_context.c @@ -68,7 +68,7 @@ #define need_GL_EXT_secondary_color #include "extension_helper.h" -#define DRIVER_DATE "20050526" +#define DRIVER_DATE "20060710" #include "vblank.h" #include "utils.h" diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c index 24c62198ac6..18cbbb35177 100644 --- a/src/mesa/drivers/dri/unichrome/via_screen.c +++ b/src/mesa/drivers/dri/unichrome/via_screen.c @@ -169,13 +169,8 @@ viaInitDriver(__DRIscreenPrivate *sPriv) __driUtilMessage("viaInitDriver: drmMap agp failed"); return GL_FALSE; } - - /* - * FIXME: This is an invalid assumption that works until handle is - * changed to mean something else than the 32-bit physical AGP address. - */ - viaScreen->agpBase = gDRIPriv->agp.handle; + viaScreen->agpBase = drmAgpBase(sPriv->fd); } else viaScreen->agpLinearStart = 0; @@ -440,16 +435,38 @@ void * __driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn, VIA_DRIDDX_VERSION_PATCH }; static const __DRIversion dri_expected = { 4, 0, 0 }; static const __DRIversion drm_expected = { 2, 3, 0 }; + static const __DRIversion drm_compat = {3, 0, 0}; + static const char *driver_name = "Unichrome"; dri_interface = interface; - if ( ! driCheckDriDdxDrmVersions2( "Unichrome", + /* + * Check ddx and dri only. + */ + + if ( ! driCheckDriDdxDrmVersions2( driver_name, dri_version, & dri_expected, ddx_version, & ddx_expected, - drm_version, & drm_expected ) ) { + drm_version, drm_version) ) { return NULL; } + /* + * Check drm version with major versioning span. + */ + + if (((drm_version->major < drm_expected.major) || + (drm_version->major > drm_compat.major)) || + ((drm_version->major == drm_expected.major) && + (drm_version->minor < drm_expected.minor))) { + + fprintf(stderr, "%s DRI driver expected DRM version %d.%d.x - %d.x.x " + "but got version %d.%d.%d\n", driver_name, + drm_expected.major, drm_expected.minor, drm_compat.major, + drm_version->major, drm_version->minor, drm_version->patch); + return NULL; + } + psp = __driUtilCreateNewScreen(dpy, scrn, psc, NULL, ddx_version, dri_version, drm_version, frame_buffer, pSAREA, fd, @@ -470,7 +487,6 @@ void * __driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn, driInitExtensions( NULL, card_extensions, GL_FALSE ); } - fprintf(stderr, "%s - succeeded\n", __FUNCTION__); return (void *) psp; } -- 2.30.2