diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2007-10-12 19:35:04 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2007-10-12 19:35:04 -0400 |
| commit | f9c6dfc4d12451c21f39f38b048758cbee5723cf (patch) | |
| tree | 5384315d9ec06a779137c63b54d6326dbc12ef81 /src/mesa/drivers/dri/mga/mgaioctl.c | |
| parent | bf805d3bf5bf191aa669b6155316a78917cf9b0e (diff) | |
| parent | a2494462cb7d557a7643452c720e0ab8fa9f4f63 (diff) | |
Merge branch 'dri2'
Conflicts:
src/mesa/drivers/dri/i915/intel_screen.c
Diffstat (limited to 'src/mesa/drivers/dri/mga/mgaioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/mga/mgaioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/mga/mgaioctl.c b/src/mesa/drivers/dri/mga/mgaioctl.c index f8587fc541..679d688925 100644 --- a/src/mesa/drivers/dri/mga/mgaioctl.c +++ b/src/mesa/drivers/dri/mga/mgaioctl.c @@ -55,7 +55,7 @@ mgaSetFence( mgaContextPtr mmesa, uint32_t * fence ) { int ret = ENOSYS; - if ( mmesa->driScreen->drmMinor >= 2 ) { + if ( mmesa->driScreen->drm_version.minor >= 2 ) { ret = drmCommandWriteRead( mmesa->driScreen->fd, DRM_MGA_SET_FENCE, fence, sizeof( uint32_t )); if (ret) { @@ -73,7 +73,7 @@ mgaWaitFence( mgaContextPtr mmesa, uint32_t fence, uint32_t * curr_fence ) { int ret = ENOSYS; - if ( mmesa->driScreen->drmMinor >= 2 ) { + if ( mmesa->driScreen->drm_version.minor >= 2 ) { uint32_t temp = fence; ret = drmCommandWriteRead( mmesa->driScreen->fd, |