diff options
| author | Brian <brian@yutani.localnet.net> | 2007-02-28 11:58:30 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-02-28 11:58:30 -0700 |
| commit | 38a88db1fc69b774ded3b7a44126e0b0f61e886b (patch) | |
| tree | 397cb8fee81e1c56f3552b8dd5b0f1b76d75d668 /src/mesa/drivers/dri/nouveau/nouveau_screen.c | |
| parent | 9f37be694ed5fc14d783559055443d4042c73393 (diff) | |
| parent | afa780c09d8e48c1c9ecaa4bce1bbe7e8e9c5e2c (diff) | |
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_screen.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_screen.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c index 881b20149f..24e77750f9 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c @@ -327,8 +327,10 @@ void * __driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn, __DRIsc __DRIscreenPrivate *psp; static const __DRIversion ddx_expected = { 1, 2, 0 }; static const __DRIversion dri_expected = { 4, 0, 0 }; - static const __DRIversion drm_expected = { 0, 0, 3 }; - + static const __DRIversion drm_expected = { 0, 0, NOUVEAU_DRM_HEADER_PATCHLEVEL }; +#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 4 +#error nouveau_drm.h version doesn't match expected version +#endif dri_interface = interface; if (!driCheckDriDdxDrmVersions2("nouveau", |