diff options
| -rw-r--r-- | linux-core/drmP.h | 11 | ||||
| -rw-r--r-- | linux/drmP.h | 11 | ||||
| -rw-r--r-- | linux/mga_dma.c | 15 |
3 files changed, 18 insertions, 19 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index a7e4d573..274e318a 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -333,12 +333,11 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, #define DRM_FIND_MAP(_map, _o) \ do { \ struct list_head *_list; \ - list_for_each(_list, &dev->maplist->head) { \ - drm_map_list_t *_r_list; \ - _r_list = (drm_map_list_t *)_list; \ - if(_r_list->map && \ - _r_list->map->offset == (_o)) { \ - (_map) = _r_list->map; \ + list_for_each( _list, &dev->maplist->head ) { \ + drm_map_list_t *_entry = (drm_map_list_t *)_list; \ + if ( _entry->map && \ + _entry->map->offset == (_o) ) { \ + (_map) = _entry->map; \ break; \ } \ } \ diff --git a/linux/drmP.h b/linux/drmP.h index a7e4d573..274e318a 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -333,12 +333,11 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, #define DRM_FIND_MAP(_map, _o) \ do { \ struct list_head *_list; \ - list_for_each(_list, &dev->maplist->head) { \ - drm_map_list_t *_r_list; \ - _r_list = (drm_map_list_t *)_list; \ - if(_r_list->map && \ - _r_list->map->offset == (_o)) { \ - (_map) = _r_list->map; \ + list_for_each( _list, &dev->maplist->head ) { \ + drm_map_list_t *_entry = (drm_map_list_t *)_list; \ + if ( _entry->map && \ + _entry->map->offset == (_o) ) { \ + (_map) = _entry->map; \ break; \ } \ } \ diff --git a/linux/mga_dma.c b/linux/mga_dma.c index ec80fb41..8b0a67a2 100644 --- a/linux/mga_dma.c +++ b/linux/mga_dma.c @@ -468,12 +468,12 @@ static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init ) dev_priv->depth_offset = init->depth_offset; dev_priv->depth_pitch = init->depth_pitch; - list_for_each(list, &dev->maplist->head) { - drm_map_list_t *r_list = (drm_map_list_t *)list; - if( r_list->map && - r_list->map->type == _DRM_SHM && - r_list->map->flags & _DRM_CONTAINS_LOCK ) { - dev_priv->sarea = r_list->map; + list_for_each( list, &dev->maplist->head ) { + drm_map_list_t *entry = (drm_map_list_t *)list; + if ( entry->map && + entry->map->type == _DRM_SHM && + (entry->map->flags & _DRM_CONTAINS_LOCK) ) { + dev_priv->sarea = entry->map; break; } } @@ -516,11 +516,12 @@ static int mga_do_init_dma( drm_device_t *dev, drm_mga_init_t *init ) */ MGA_WRITE( MGA_PRIMADDRESS, dev_priv->primary->offset | MGA_DMA_GENERAL ); - +#if 0 MGA_WRITE( MGA_PRIMPTR, virt_to_bus((void *)dev_priv->prim.status) | MGA_PRIMPTREN0 | /* Soft trap, SECEND, SETUPEND */ MGA_PRIMPTREN1 ); /* DWGSYNC */ +#endif dev_priv->prim.start = (u8 *)dev_priv->primary->handle; dev_priv->prim.end = ((u8 *)dev_priv->primary->handle |