aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/via_verifier.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 15:15:50 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 15:15:50 -0400
commitc2dc1ad582196208a2f990eb0230eb922046c684 (patch)
treef2c7d03a9f8007af0a43111423dbf96ccef77db4 /drivers/char/drm/via_verifier.c
parent5b37696fda07b8acf37beba3853f83106397ccdf (diff)
parentff4135aeb1f9a0201f8e22400ebc1d570df9016e (diff)
Merge branch 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: remove core typedefs from the ioc32 wrappers drm: remove sarea typedefs drm: detypedef the hashtab and more of sman drm: de-typedef sman drm: detypedeffing continues... drm: detypef waitlist/freelist/buf_entry/device_dma/drm_queue structs drm: drop drm_vma_entry_t, drm_magic_entry_t drm: drop drm_buf_t typedef drm: fixup other drivers for typedef removals drm: remove drm_file_t, drm_device_t and drm_head_t typedefs drm: remove a bunch of typedefs on the userspace interface r300: updates register header radeon: add support for vblank on crtc2 drm: cleanup list initialisation drm: fix typo on code drm getsarea drm: remove DRM_GETSAREA and replace with drm_getsarea function drm: cleanup use of Linux list handling macros
Diffstat (limited to 'drivers/char/drm/via_verifier.c')
-rw-r--r--drivers/char/drm/via_verifier.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/char/drm/via_verifier.c b/drivers/char/drm/via_verifier.c
index 2e7e08078287..832d48356e91 100644
--- a/drivers/char/drm/via_verifier.c
+++ b/drivers/char/drm/via_verifier.c
@@ -252,10 +252,9 @@ eat_words(const uint32_t ** buf, const uint32_t * buf_end, unsigned num_words)
252static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, 252static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq,
253 unsigned long offset, 253 unsigned long offset,
254 unsigned long size, 254 unsigned long size,
255 drm_device_t * dev) 255 struct drm_device * dev)
256{ 256{
257 struct list_head *list; 257 struct drm_map_list *r_list;
258 drm_map_list_t *r_list;
259 drm_local_map_t *map = seq->map_cache; 258 drm_local_map_t *map = seq->map_cache;
260 259
261 if (map && map->offset <= offset 260 if (map && map->offset <= offset
@@ -263,8 +262,7 @@ static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq,
263 return map; 262 return map;
264 } 263 }
265 264
266 list_for_each(list, &dev->maplist->head) { 265 list_for_each_entry(r_list, &dev->maplist, head) {
267 r_list = (drm_map_list_t *) list;
268 map = r_list->map; 266 map = r_list->map;
269 if (!map) 267 if (!map)
270 continue; 268 continue;
@@ -964,7 +962,7 @@ via_parse_vheader6(drm_via_private_t * dev_priv, uint32_t const **buffer,
964 962
965int 963int
966via_verify_command_stream(const uint32_t * buf, unsigned int size, 964via_verify_command_stream(const uint32_t * buf, unsigned int size,
967 drm_device_t * dev, int agp) 965 struct drm_device * dev, int agp)
968{ 966{
969 967
970 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; 968 drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
@@ -1039,7 +1037,7 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
1039} 1037}
1040 1038
1041int 1039int
1042via_parse_command_stream(drm_device_t * dev, const uint32_t * buf, 1040via_parse_command_stream(struct drm_device * dev, const uint32_t * buf,
1043 unsigned int size) 1041 unsigned int size)
1044{ 1042{
1045 1043